Use AND PoC.
#7310
Merged
Use AND PoC.
#7310
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Wosin
commented
Sep 4, 2022
| @@ -126,6 +126,12 @@ object SmartAssertMacros { | |||
|
|
|||
| def transform[A: Type](expr: Expr[A])(using PositionContext, Quotes) : Expr[TestArrow[Any, A]] = { | |||
| import quotes.reflect._ | |||
| def isBool(term: quotes.reflect.Term): Boolean = { | |||
| term.tpe.widen.asType match { | |||
| case '[Boolean] => true | |||
There was a problem hiding this comment.
I don't like this function, but I have no idea if we can match just particular types in :
case Unseal(MethodCall(lhs, "&&", tpes, Some(List(rhs)))) if isBool(lhs) =>
Wosin
commented
Sep 4, 2022
| @@ -173,10 +173,10 @@ class SmartAssertMacros(val c: blackbox.Context) { | |||
| case q"!($inner)" => | |||
| AST.Not(parseExpr(inner), pos.getPos(tree), pos.getPos(inner)) | |||
|
|
|||
| case q"$lhs && $rhs" => | |||
| case q"$lhs && $rhs" if lhs.tpe == typeOf[Boolean] => | |||
There was a problem hiding this comment.
This makes sure that if we have a && function defined for some type we gonna still handle that in assert true:
object AssertSpec extends ZIOSpecDefault {
override def spec: Spec[Any, Any] =
test("") {
val first = TestClazz(10)
val second = TestClazz(20)
zio.test.assertTrue(first && second)
}
}
case class TestClazz(int: Int){
def &&(anotherClz: TestClazz): Boolean = {
false
}
}
Currently, we are just going to fail compilation for that case.
There was a problem hiding this comment.
Again, open to propositions if there is a simpler/prettier way to write this.
|
@Wosin Thanks for your work on this! @adamgfraser Is this good to merge? |
|
@jdegoes Yes lets get this in! |
adamgfraser
approved these changes
Nov 23, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes #7260.
The problem described in the issue is related to the fact that in Scala 3, logicall
&&and||are both mapped toAndThencase class. This PR fixes it so that we can map logical operations toAndandOrrespectively.