diff options
| author | Andre Brait <andrebrait@gmail.com> | 2020-07-13 18:50:12 +0200 |
|---|---|---|
| committer | Roel Spilker <r.spilker@gmail.com> | 2020-09-24 22:25:15 +0200 |
| commit | d00ab552e199410c283049cd8d9359a69855f1f2 (patch) | |
| tree | d625204bafff70f938e8bc34c08cb5a3289fd235 /src/core/lombok/javac | |
| parent | 4e0ffbc32913001082dd2387a20b480076ddd20a (diff) | |
| download | lombok-d00ab552e199410c283049cd8d9359a69855f1f2.tar.gz lombok-d00ab552e199410c283049cd8d9359a69855f1f2.tar.bz2 lombok-d00ab552e199410c283049cd8d9359a69855f1f2.zip | |
Finish implementation, add tests
Diffstat (limited to 'src/core/lombok/javac')
| -rw-r--r-- | src/core/lombok/javac/handlers/HandleEqualsAndHashCode.java | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/core/lombok/javac/handlers/HandleEqualsAndHashCode.java b/src/core/lombok/javac/handlers/HandleEqualsAndHashCode.java index 19f6d750..063fb780 100644 --- a/src/core/lombok/javac/handlers/HandleEqualsAndHashCode.java +++ b/src/core/lombok/javac/handlers/HandleEqualsAndHashCode.java @@ -42,6 +42,8 @@ import com.sun.tools.javac.tree.JCTree.JCBlock; import com.sun.tools.javac.tree.JCTree.JCClassDecl; import com.sun.tools.javac.tree.JCTree.JCExpression; import com.sun.tools.javac.tree.JCTree.JCExpressionStatement; +import com.sun.tools.javac.tree.JCTree.JCFieldAccess; +import com.sun.tools.javac.tree.JCTree.JCIdent; import com.sun.tools.javac.tree.JCTree.JCMethodDecl; import com.sun.tools.javac.tree.JCTree.JCMethodInvocation; import com.sun.tools.javac.tree.JCTree.JCModifiers; @@ -244,11 +246,12 @@ public class HandleEqualsAndHashCode extends JavacAnnotationHandler<EqualsAndHas boolean isEmpty = members.isEmpty(); - /* if ($hashCodeCache != 0) return $hashCodeCache; */ { + /* if (this.$hashCodeCache != 0) return this.$hashCodeCache; */ { if (cacheHashCode) { - Name cacheHashCodeName = typeNode.toName(HASH_CODE_CACHE_NAME); - JCExpression cacheNotZero = maker.Binary(CTC_NOT_EQUAL, maker.Ident(cacheHashCodeName), maker.Literal(CTC_INT, 0)); - statements.append(maker.If(cacheNotZero, maker.Return(maker.Ident(cacheHashCodeName)), null)); + JCIdent receiver = maker.Ident(typeNode.toName("this")); + JCFieldAccess cacheHashCodeFieldAccess = maker.Select(receiver, typeNode.toName(HASH_CODE_CACHE_NAME)); + JCExpression cacheNotZero = maker.Binary(CTC_NOT_EQUAL, cacheHashCodeFieldAccess, maker.Literal(CTC_INT, 0)); + statements.append(maker.If(cacheNotZero, maker.Return(cacheHashCodeFieldAccess), null)); } } @@ -341,10 +344,11 @@ public class HandleEqualsAndHashCode extends JavacAnnotationHandler<EqualsAndHas } } - /* $hashCodeCache = result; */ { + /* this.$hashCodeCache = result; */ { if (cacheHashCode) { - Name cacheHashCodeName = typeNode.toName(HASH_CODE_CACHE_NAME); - statements.append(maker.Exec(maker.Assign(maker.Ident(cacheHashCodeName), maker.Ident(resultName)))); + JCIdent receiver = maker.Ident(typeNode.toName("this")); + JCFieldAccess cacheHashCodeFieldAccess = maker.Select(receiver, typeNode.toName(HASH_CODE_CACHE_NAME)); + statements.append(maker.Exec(maker.Assign(cacheHashCodeFieldAccess, maker.Ident(resultName)))); } } |