Skip to content

Rename memberFunctionCall argument since it's not always a member function. #23

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 1 commit into from
Sep 25, 2023
Merged

Rename memberFunctionCall argument since it's not always a member function. #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions Sources/Testing/Expectations/ExpectationChecking+Macro.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,13 +171,13 @@ public func __checkBinaryOperation<T, U>(
/// - Warning: This function is used to implement the `#expect()` and
/// `#require()` macros. Do not call it directly.
public func __checkFunctionCall<T, each U>(
_ lhs: T, calling memberFunctionCall: (T, repeat each U) throws -> Bool, _ arguments: repeat each U,
_ lhs: T, calling functionCall: (T, repeat each U) throws -> Bool, _ arguments: repeat each U,
sourceCode: SourceCode,
comments: @autoclosure () -> [Comment],
isRequired: Bool,
sourceLocation: SourceLocation
) rethrows -> Result<Void, any Error> {
let condition = try memberFunctionCall(lhs, repeat each arguments)
let condition = try functionCall(lhs, repeat each arguments)
return __checkValue(
condition,
sourceCode: sourceCode,
Expand All @@ -200,13 +200,13 @@ public func __checkFunctionCall<T, each U>(
/// - Warning: This function is used to implement the `#expect()` and
/// `#require()` macros. Do not call it directly.
public func __checkInoutFunctionCall<T, /*each*/ U>(
_ lhs: T, calling memberFunctionCall: (T, inout /*repeat each*/ U) throws -> Bool, _ arguments: inout /*repeat each*/ U,
_ lhs: T, calling functionCall: (T, inout /*repeat each*/ U) throws -> Bool, _ arguments: inout /*repeat each*/ U,
sourceCode: SourceCode,
comments: @autoclosure () -> [Comment],
isRequired: Bool,
sourceLocation: SourceLocation
) rethrows -> Result<Void, any Error> {
let condition = try memberFunctionCall(lhs, /*repeat each*/ &arguments)
let condition = try functionCall(lhs, /*repeat each*/ &arguments)
return __checkValue(
condition,
sourceCode: sourceCode,
Expand All @@ -230,13 +230,13 @@ public func __checkInoutFunctionCall<T, /*each*/ U>(
/// - Warning: This function is used to implement the `#expect()` and
/// `#require()` macros. Do not call it directly.
public func __checkFunctionCall<T, each U, R>(
_ lhs: T, calling memberFunctionCall: (T, repeat each U) throws -> R?, _ arguments: repeat each U,
_ lhs: T, calling functionCall: (T, repeat each U) throws -> R?, _ arguments: repeat each U,
sourceCode: SourceCode,
comments: @autoclosure () -> [Comment],
isRequired: Bool,
sourceLocation: SourceLocation
) rethrows -> Result<R, any Error> {
let optionalValue = try memberFunctionCall(lhs, repeat each arguments)
let optionalValue = try functionCall(lhs, repeat each arguments)
return __checkValue(
optionalValue,
sourceCode: sourceCode,
Expand All @@ -260,13 +260,13 @@ public func __checkFunctionCall<T, each U, R>(
/// - Warning: This function is used to implement the `#expect()` and
/// `#require()` macros. Do not call it directly.
public func __checkInoutFunctionCall<T, /*each*/ U, R>(
_ lhs: T, calling memberFunctionCall: (T, inout /*repeat each*/ U) throws -> R?, _ arguments: inout /*repeat each*/ U,
_ lhs: T, calling functionCall: (T, inout /*repeat each*/ U) throws -> R?, _ arguments: inout /*repeat each*/ U,
sourceCode: SourceCode,
comments: @autoclosure () -> [Comment],
isRequired: Bool,
sourceLocation: SourceLocation
) rethrows -> Result<R, any Error> {
let optionalValue = try memberFunctionCall(lhs, /*repeat each*/ &arguments)
let optionalValue = try functionCall(lhs, /*repeat each*/ &arguments)
return __checkValue(
optionalValue,
sourceCode: sourceCode,
Expand Down