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/eclipse | |
| 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/eclipse')
| -rwxr-xr-x | src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java b/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java index 76a46814..6e9423d5 100755 --- a/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java +++ b/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java @@ -62,6 +62,7 @@ import org.eclipse.jdt.internal.compiler.ast.EqualExpression; import org.eclipse.jdt.internal.compiler.ast.Expression; import org.eclipse.jdt.internal.compiler.ast.FalseLiteral; import org.eclipse.jdt.internal.compiler.ast.FieldDeclaration; +import org.eclipse.jdt.internal.compiler.ast.FieldReference; import org.eclipse.jdt.internal.compiler.ast.IfStatement; import org.eclipse.jdt.internal.compiler.ast.InstanceOfExpression; import org.eclipse.jdt.internal.compiler.ast.IntLiteral; @@ -305,8 +306,10 @@ public class HandleEqualsAndHashCode extends EclipseAnnotationHandler<EqualsAndH /* if ($hashCodeCache != 0) return $hashCodeCache; */ { if (cacheHashCode) { - SingleNameReference hashCodeCacheRef = new SingleNameReference(HASH_CODE_CACHE_NAME_ARR, p); + FieldReference hashCodeCacheRef = new FieldReference(HASH_CODE_CACHE_NAME_ARR, p); + hashCodeCacheRef.receiver = new ThisReference(pS, pE); setGeneratedBy(hashCodeCacheRef, source); + setGeneratedBy(hashCodeCacheRef.receiver, source); EqualExpression cacheNotZero = new EqualExpression(hashCodeCacheRef, makeIntLiteral("0".toCharArray(), source), OperatorIds.NOT_EQUAL); setGeneratedBy(cacheNotZero, source); ReturnStatement returnCache = new ReturnStatement(hashCodeCacheRef, pS, pS); @@ -448,8 +451,10 @@ public class HandleEqualsAndHashCode extends EclipseAnnotationHandler<EqualsAndH /* $hashCodeCache = result; */ { if (cacheHashCode) { - SingleNameReference hashCodeCacheRef = new SingleNameReference(HASH_CODE_CACHE_NAME_ARR, p); + FieldReference hashCodeCacheRef = new FieldReference(HASH_CODE_CACHE_NAME_ARR, p); + hashCodeCacheRef.receiver = new ThisReference(pS, pE); setGeneratedBy(hashCodeCacheRef, source); + setGeneratedBy(hashCodeCacheRef.receiver, source); SingleNameReference resultRef = new SingleNameReference(RESULT, p); setGeneratedBy(resultRef, source); Assignment cacheResult = new Assignment(hashCodeCacheRef, resultRef, pE); |