From ffd30c07c89515ee6b03b540faffc3775d316d0e Mon Sep 17 00:00:00 2001 From: Torsten Bergmann Date: Sat, 27 Jan 2024 17:07:49 +0100 Subject: [PATCH] Do not use notNil - use isNotNil instead Fix #290 --- .../instance/testBlockClosureChangeDifferentBytecodes.st | 2 +- .../instance/testBlockClosureChangeSameBytecodes.st | 2 +- .../instance/testBlockClosureRemoved.st | 2 +- .../instance/testBlockClosureRemovedNonClean.st | 2 +- .../instance/testDoIt.st | 2 +- .../instance/testInstalledModified.st | 2 +- .../instance/testNotInstalled.st | 2 +- .../instance/testBlockClosureChangeDifferentBytecodes.st | 2 +- .../testBlockClosureChangeDifferentBytecodesNonClean.st | 2 +- .../instance/testBlockClosureRemoved.st | 2 +- .../instance/testBlockClosureRemovedNonClean.st | 2 +- .../instance/testDepthLimit.st | 4 ++-- .../instance/testEnableObjectsLimitWarning.st | 2 +- .../instance/testObjectLimit.st | 2 +- .../FLDepthLimitingAnalysis.class/instance/mapAndTrace..st | 2 +- .../FLDepthLimitingAnalysis.class/properties.json | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/repository/Fuel-Core-Tests.package/FLBlockClosureSerializationTest.class/instance/testBlockClosureChangeDifferentBytecodes.st b/repository/Fuel-Core-Tests.package/FLBlockClosureSerializationTest.class/instance/testBlockClosureChangeDifferentBytecodes.st index d74999f3..365e9b30 100644 --- a/repository/Fuel-Core-Tests.package/FLBlockClosureSerializationTest.class/instance/testBlockClosureChangeDifferentBytecodes.st +++ b/repository/Fuel-Core-Tests.package/FLBlockClosureSerializationTest.class/instance/testBlockClosureChangeDifferentBytecodes.st @@ -12,7 +12,7 @@ testBlockClosureChangeDifferentBytecodes in: aClass. aClosure := aClass new perform: #methodWithClosure. self assert: aClosure isClean. - self assert: aClosure notNil. + self assert: aClosure isNotNil. self serialize: aClosure. self classFactory diff --git a/repository/Fuel-Core-Tests.package/FLBlockClosureSerializationTest.class/instance/testBlockClosureChangeSameBytecodes.st b/repository/Fuel-Core-Tests.package/FLBlockClosureSerializationTest.class/instance/testBlockClosureChangeSameBytecodes.st index 088282d1..792c9c6b 100644 --- a/repository/Fuel-Core-Tests.package/FLBlockClosureSerializationTest.class/instance/testBlockClosureChangeSameBytecodes.st +++ b/repository/Fuel-Core-Tests.package/FLBlockClosureSerializationTest.class/instance/testBlockClosureChangeSameBytecodes.st @@ -12,7 +12,7 @@ testBlockClosureChangeSameBytecodes in: aClass. aClosure := aClass new perform: #methodWithClosure. self assert: aClosure isClean. - self assert: aClosure outerContext notNil. + self assert: aClosure outerContext isNotNil. self serialize: aClosure. self classFactory diff --git a/repository/Fuel-Core-Tests.package/FLBlockClosureSerializationTest.class/instance/testBlockClosureRemoved.st b/repository/Fuel-Core-Tests.package/FLBlockClosureSerializationTest.class/instance/testBlockClosureRemoved.st index f7cf6d5d..7bb3b9b2 100644 --- a/repository/Fuel-Core-Tests.package/FLBlockClosureSerializationTest.class/instance/testBlockClosureRemoved.st +++ b/repository/Fuel-Core-Tests.package/FLBlockClosureSerializationTest.class/instance/testBlockClosureRemoved.st @@ -12,7 +12,7 @@ testBlockClosureRemoved in: aClass. aClosure := aClass new perform: #methodWithClosure. self assert: aClosure isClean. - self assert: aClosure outerContext notNil. + self assert: aClosure outerContext isNotNil. self serialize: aClosure. aClass removeSelectorSilently: #methodWithClosure. diff --git a/repository/Fuel-Core-Tests.package/FLBlockClosureSerializationTest.class/instance/testBlockClosureRemovedNonClean.st b/repository/Fuel-Core-Tests.package/FLBlockClosureSerializationTest.class/instance/testBlockClosureRemovedNonClean.st index 2c93f7b6..8e3a4aac 100644 --- a/repository/Fuel-Core-Tests.package/FLBlockClosureSerializationTest.class/instance/testBlockClosureRemovedNonClean.st +++ b/repository/Fuel-Core-Tests.package/FLBlockClosureSerializationTest.class/instance/testBlockClosureRemovedNonClean.st @@ -9,7 +9,7 @@ testBlockClosureRemovedNonClean in: aClass. aClosure := aClass new perform: #methodWithClosure. self deny: aClosure isClean. - self assert: aClosure outerContext notNil. + self assert: aClosure outerContext isNotNil. self serialize: aClosure. aClass removeSelectorSilently: #methodWithClosure. diff --git a/repository/Fuel-Core-Tests.package/FLCompiledMethodSerializationTest.class/instance/testDoIt.st b/repository/Fuel-Core-Tests.package/FLCompiledMethodSerializationTest.class/instance/testDoIt.st index b6aa807b..0ad0e2c0 100644 --- a/repository/Fuel-Core-Tests.package/FLCompiledMethodSerializationTest.class/instance/testDoIt.st +++ b/repository/Fuel-Core-Tests.package/FLCompiledMethodSerializationTest.class/instance/testDoIt.st @@ -14,7 +14,7 @@ testDoIt self deny: materialized isInstalled. self assert: materialized isDoIt. "we serialized the source, trailer is cleared" - self assert: materialized sourceCode notNil. + self assert: materialized sourceCode isNotNil. self deny: materialized hasSourcePointer. self assert: (materialized isEqualRegardlessTrailerTo: theCompiledMethod) \ No newline at end of file diff --git a/repository/Fuel-Core-Tests.package/FLCompiledMethodSerializationTest.class/instance/testInstalledModified.st b/repository/Fuel-Core-Tests.package/FLCompiledMethodSerializationTest.class/instance/testInstalledModified.st index 39a91172..d2481ff3 100644 --- a/repository/Fuel-Core-Tests.package/FLCompiledMethodSerializationTest.class/instance/testInstalledModified.st +++ b/repository/Fuel-Core-Tests.package/FLCompiledMethodSerializationTest.class/instance/testInstalledModified.st @@ -23,4 +23,4 @@ testInstalledModified self deny: materialized isInstalled. self deny: materialized isDoIt. "we serialized the source" - self assert: materialized sourceCode notNil. \ No newline at end of file + self assert: materialized sourceCode isNotNil. \ No newline at end of file diff --git a/repository/Fuel-Core-Tests.package/FLCompiledMethodSerializationTest.class/instance/testNotInstalled.st b/repository/Fuel-Core-Tests.package/FLCompiledMethodSerializationTest.class/instance/testNotInstalled.st index fdb43592..c172cf16 100644 --- a/repository/Fuel-Core-Tests.package/FLCompiledMethodSerializationTest.class/instance/testNotInstalled.st +++ b/repository/Fuel-Core-Tests.package/FLCompiledMethodSerializationTest.class/instance/testNotInstalled.st @@ -13,7 +13,7 @@ testNotInstalled self deny: materialized isInstalled. self deny: materialized isDoIt. "we serialized the source, trailer is empty" - self assert: materialized sourceCode notNil. + self assert: materialized sourceCode isNotNil. self deny: materialized hasSourcePointer. self assert: (materialized isEqualRegardlessTrailerTo: theCompiledMethod) \ No newline at end of file diff --git a/repository/Fuel-Core-Tests.package/FLFullBlockClosureSerializationTest.class/instance/testBlockClosureChangeDifferentBytecodes.st b/repository/Fuel-Core-Tests.package/FLFullBlockClosureSerializationTest.class/instance/testBlockClosureChangeDifferentBytecodes.st index cc6fb656..034e5e1c 100644 --- a/repository/Fuel-Core-Tests.package/FLFullBlockClosureSerializationTest.class/instance/testBlockClosureChangeDifferentBytecodes.st +++ b/repository/Fuel-Core-Tests.package/FLFullBlockClosureSerializationTest.class/instance/testBlockClosureChangeDifferentBytecodes.st @@ -12,7 +12,7 @@ testBlockClosureChangeDifferentBytecodes in: aClass. aClosure := aClass new perform: #methodWithClosure. self assert: aClosure isClean. - self assert: aClosure outerContext notNil. + self assert: aClosure outerContext isNotNil. self serializer fullySerializeMethod: aClosure compiledBlock method. self serialize: aClosure. diff --git a/repository/Fuel-Core-Tests.package/FLFullBlockClosureSerializationTest.class/instance/testBlockClosureChangeDifferentBytecodesNonClean.st b/repository/Fuel-Core-Tests.package/FLFullBlockClosureSerializationTest.class/instance/testBlockClosureChangeDifferentBytecodesNonClean.st index afb242cf..836b5854 100644 --- a/repository/Fuel-Core-Tests.package/FLFullBlockClosureSerializationTest.class/instance/testBlockClosureChangeDifferentBytecodesNonClean.st +++ b/repository/Fuel-Core-Tests.package/FLFullBlockClosureSerializationTest.class/instance/testBlockClosureChangeDifferentBytecodesNonClean.st @@ -9,7 +9,7 @@ testBlockClosureChangeDifferentBytecodesNonClean in: aClass. aClosure := aClass new perform: #methodWithClosure. self deny: aClosure isClean. - self assert: aClosure outerContext notNil. + self assert: aClosure outerContext isNotNil. self serializer fullySerializeMethod: aClosure compiledBlock method. self serialize: aClosure. diff --git a/repository/Fuel-Core-Tests.package/FLFullBlockClosureSerializationTest.class/instance/testBlockClosureRemoved.st b/repository/Fuel-Core-Tests.package/FLFullBlockClosureSerializationTest.class/instance/testBlockClosureRemoved.st index ccff394e..dec29477 100644 --- a/repository/Fuel-Core-Tests.package/FLFullBlockClosureSerializationTest.class/instance/testBlockClosureRemoved.st +++ b/repository/Fuel-Core-Tests.package/FLFullBlockClosureSerializationTest.class/instance/testBlockClosureRemoved.st @@ -12,7 +12,7 @@ testBlockClosureRemoved in: aClass. aClosure := aClass new perform: #methodWithClosure. self assert: aClosure isClean. - self assert: aClosure outerContext notNil. + self assert: aClosure outerContext isNotNil. self serializer fullySerializeMethod: aClosure compiledBlock method. self serialize: aClosure. diff --git a/repository/Fuel-Core-Tests.package/FLFullBlockClosureSerializationTest.class/instance/testBlockClosureRemovedNonClean.st b/repository/Fuel-Core-Tests.package/FLFullBlockClosureSerializationTest.class/instance/testBlockClosureRemovedNonClean.st index 5c9ae17a..33d5f353 100644 --- a/repository/Fuel-Core-Tests.package/FLFullBlockClosureSerializationTest.class/instance/testBlockClosureRemovedNonClean.st +++ b/repository/Fuel-Core-Tests.package/FLFullBlockClosureSerializationTest.class/instance/testBlockClosureRemovedNonClean.st @@ -9,7 +9,7 @@ testBlockClosureRemovedNonClean in: aClass. aClosure := aClass new perform: #methodWithClosure. self deny: aClosure isClean. - self assert: aClosure outerContext notNil. + self assert: aClosure outerContext isNotNil. self serializer fullySerializeMethod: aClosure compiledBlock method. self serialize: aClosure. diff --git a/repository/Fuel-Core-Tests.package/FLLimitingSerializationTest.class/instance/testDepthLimit.st b/repository/Fuel-Core-Tests.package/FLLimitingSerializationTest.class/instance/testDepthLimit.st index 960fea8f..94278275 100644 --- a/repository/Fuel-Core-Tests.package/FLLimitingSerializationTest.class/instance/testDepthLimit.st +++ b/repository/Fuel-Core-Tests.package/FLLimitingSerializationTest.class/instance/testDepthLimit.st @@ -17,9 +17,9 @@ testDepthLimit serialize. materialized := self materialized. - self assert: materialized left notNil. + self assert: materialized left isNotNil. self assert: materialized right equals: 1. - self assert: materialized left left notNil. + self assert: materialized left left isNotNil. self assert: materialized left right equals: 2. self assert: materialized left left left isNil. self assert: materialized left left right isNil \ No newline at end of file diff --git a/repository/Fuel-Core-Tests.package/FLLimitingSerializationTest.class/instance/testEnableObjectsLimitWarning.st b/repository/Fuel-Core-Tests.package/FLLimitingSerializationTest.class/instance/testEnableObjectsLimitWarning.st index 62973738..5c078750 100644 --- a/repository/Fuel-Core-Tests.package/FLLimitingSerializationTest.class/instance/testEnableObjectsLimitWarning.st +++ b/repository/Fuel-Core-Tests.package/FLLimitingSerializationTest.class/instance/testEnableObjectsLimitWarning.st @@ -23,7 +23,7 @@ testEnableObjectsLimitWarning do: [ :ex | ex resume ]. materialized := self materialized. - self assert: materialized left notNil. + self assert: materialized left isNotNil. self assert: materialized right equals: 1. self assert: materialized left left isNil. self assert: materialized left right isNil \ No newline at end of file diff --git a/repository/Fuel-Core-Tests.package/FLLimitingSerializationTest.class/instance/testObjectLimit.st b/repository/Fuel-Core-Tests.package/FLLimitingSerializationTest.class/instance/testObjectLimit.st index 2c5c703a..9343ffec 100644 --- a/repository/Fuel-Core-Tests.package/FLLimitingSerializationTest.class/instance/testObjectLimit.st +++ b/repository/Fuel-Core-Tests.package/FLLimitingSerializationTest.class/instance/testObjectLimit.st @@ -17,7 +17,7 @@ testObjectLimit serialize. materialized := self materialized. - self assert: materialized left notNil. + self assert: materialized left isNotNil. self assert: materialized right equals: 1. self assert: materialized left left isNil. self assert: materialized left right equals: 2 \ No newline at end of file diff --git a/repository/Fuel-Core.package/FLDepthLimitingAnalysis.class/instance/mapAndTrace..st b/repository/Fuel-Core.package/FLDepthLimitingAnalysis.class/instance/mapAndTrace..st index 78bf1ad6..cb5c8135 100644 --- a/repository/Fuel-Core.package/FLDepthLimitingAnalysis.class/instance/mapAndTrace..st +++ b/repository/Fuel-Core.package/FLDepthLimitingAnalysis.class/instance/mapAndTrace..st @@ -4,7 +4,7 @@ mapAndTrace: anObject ifTrue: [ depth := depth + 1 ]. previousStackSize := objectStack size. - (anObject notNil and: [ + (anObject isNotNil and: [ depth > depthLimit]) ifTrue: [ firstMapper diff --git a/repository/Fuel-Core.package/FLDepthLimitingAnalysis.class/properties.json b/repository/Fuel-Core.package/FLDepthLimitingAnalysis.class/properties.json index 99ac51e0..e139d8f9 100644 --- a/repository/Fuel-Core.package/FLDepthLimitingAnalysis.class/properties.json +++ b/repository/Fuel-Core.package/FLDepthLimitingAnalysis.class/properties.json @@ -1,5 +1,5 @@ { - "commentStamp" : "MaxLeske 6/21/2021 12:59", + "commentStamp" : "", "super" : "FLAnalysis", "category" : "Fuel-Core-Base", "classinstvars" : [ ],