unify at:ifAbsent: and find:

ApptiveGrid · Dec 6, 2023 · 85cba79 · 85cba79
1 parent a72bbe1
commit 85cba79
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/Soil-Core/SoilBTreeIterator.class.st b/src/Soil-Core/SoilBTreeIterator.class.st
@@ -14,7 +14,6 @@ SoilBTreeIterator >> basicAt: key put: anObject [
 
 { #category : #private }
 SoilBTreeIterator >> findPageFor: key [
-	currentKey := key.
 	^currentPage := index rootPage find: key with: index
 ]
 

diff --git a/src/Soil-Core/SoilIndexIterator.class.st b/src/Soil-Core/SoilIndexIterator.class.st
@@ -27,13 +27,10 @@ SoilIndexIterator >> at: aKeyObject [
 	^ self at: aKeyObject ifAbsent: [ KeyNotFound signalFor: aKeyObject in: self  ] 
 ]
 
-{ #category : #private }
+{ #category : #accessing }
 SoilIndexIterator >> at: aKeyObject ifAbsent: aBlock [
 	currentKey := (aKeyObject asSkipListKeyOfSize: index keySize) asInteger.
-	self findPageFor: currentKey.
-	^ currentPage 
-		valueAt: currentKey
-		ifAbsent: aBlock 
+	^self find: currentKey ifAbsent: aBlock
 ]
 
 { #category : #accessing }
@@ -45,6 +42,11 @@ SoilIndexIterator >> at: aKeyObject put: anObject [
 		put: anObject
 ]
 
+{ #category : #accessing }
+SoilIndexIterator >> basicAt: key put: anObject [
+	self subclassResponsibility
+]
+
 { #category : #accessing }
 SoilIndexIterator >> currentPage [
 
@@ -66,9 +68,14 @@ SoilIndexIterator >> do: aBlock [
 
 { #category : #private }
 SoilIndexIterator >> find: key [
+	^ self find: key ifAbsent: [ ]
+]
+
+{ #category : #private }
+SoilIndexIterator >> find: key ifAbsent: aBlock [
 	currentKey := key.
 	self findPageFor: key.
-	^ currentPage valueAt: currentKey
+	^ currentPage valueAt: key ifAbsent: aBlock
 ]
 
 { #category : #private }