.

wcfs/internal/xbtree/blib/rangemap.go.in

@@ -144,44 +144,44 @@ func (M *RangedMap) SetRange(r KeyRange, v VALUE) {
 	// entries in [ilo:jhi) ∈ [r.Lo,r.hi) and should be merged into one
 	// XXX check different values
 	if (jhi - ilo) > 1 {
-		lo  := S.rangev[ilo].Lo
-		hi_ := S.rangev[jhi-1].Hi_
-		vReplaceSlice(&S.rangev, ilo,jhi, KeyRange{lo,hi_})
-		debugfRMap("\tmerge S[%d:%d]\t-> %s\n", ilo, jhi, S)
+		lo  := M.entryv[ilo].Lo
+		hi_ := M.entryv[jhi-1].Hi_
+		vReplaceSlice(&M.entryv, ilo,jhi, KeyRange{lo,hi_})
+		debugfRMap("\tmerge M[%d:%d]\t-> %s\n", ilo, jhi, M)
 	}
 	jhi = -1 // no longer valid
 
 	// if [r.lo,r.hi) was outside of any entry - create new entry
-	if r.Hi_ < S.rangev[ilo].Lo {
-		vInsert(&S.rangev, ilo, r)
-		debugfRMap("\tinsert %s\t-> %s\n", r, S)
+	if r.Hi_ < M.entryv[ilo].Lo {
+		vInsert(&M.entryv, ilo, r)
+		debugfRMap("\tinsert %s\t-> %s\n", r, M)
 	}
 
 	// now we have covered entries merged as needed into [ilo]
 	// extend this entry if r coverage is wider
-	if r.Lo < S.rangev[ilo].Lo {
-		S.rangev[ilo].Lo = r.Lo
-		debugfRMap("\textend left\t-> %s\n", S)
+	if r.Lo < M.entryv[ilo].Lo {
+		M.entryv[ilo].Lo = r.Lo
+		debugfRMap("\textend left\t-> %s\n", M)
 	}
-	if r.Hi_ > S.rangev[ilo].Hi_ {
-		S.rangev[ilo].Hi_ = r.Hi_
-		debugfRMap("\textend right\t-> %s\n", S)
+	if r.Hi_ > M.entryv[ilo].Hi_ {
+		M.entryv[ilo].Hi_ = r.Hi_
+		debugfRMap("\textend right\t-> %s\n", M)
 	}
 
 	// and check if we should merge it with right/left neighbours
-	if ilo+1 < len(S.rangev) { // right
-		if S.rangev[ilo].Hi_+1 == S.rangev[ilo+1].Lo {	// XXX && .value same
-			vReplaceSlice(&S.rangev, ilo,ilo+2,
-				KeyRange{S.rangev[ilo].Lo, S.rangev[ilo+1].Hi_})
-			debugfRMap("\tmerge right\t-> %s\n", S)
+	if ilo+1 < len(M.entryv) { // right
+		if M.entryv[ilo].Hi_+1 == M.entryv[ilo+1].Lo {	// XXX && .value same
+			vReplaceSlice(&M.entryv, ilo,ilo+2,
+				KeyRange{M.entryv[ilo].Lo, M.entryv[ilo+1].Hi_})
+			debugfRMap("\tmerge right\t-> %s\n", M)
 		}
 	}
 
 	if ilo > 0 { // left
-		if S.rangev[ilo-1].Hi_+1 == S.rangev[ilo].Lo {	// XXX && .value same
-			vReplaceSlice(&S.rangev, ilo-1,ilo+1,
-				KeyRange{S.rangev[ilo-1].Lo, S.rangev[ilo].Hi_})
-			debugfRMap("\tmerge left\t-> %s\n", S)
+		if M.entryv[ilo-1].Hi_+1 == M.entryv[ilo].Lo {	// XXX && .value same
+			vReplaceSlice(&M.entryv, ilo-1,ilo+1,
+				KeyRange{M.entryv[ilo-1].Lo, M.entryv[ilo].Hi_})
+			debugfRMap("\tmerge left\t-> %s\n", M)
 		}
 	}
 

wcfs/internal/xbtree/blib/zrangemap_void.go

@@ -146,44 +146,44 @@ func (M *_RangedMap_void) SetRange(r KeyRange, v void) {
 	// entries in [ilo:jhi) ∈ [r.Lo,r.hi) and should be merged into one
 	// XXX check different values
 	if (jhi - ilo) > 1 {
-		lo  := S.rangev[ilo].Lo
-		hi_ := S.rangev[jhi-1].Hi_
-		vReplaceSlice__RangedMap_void(&S.rangev, ilo,jhi, KeyRange{lo,hi_})
-		debugf_RangedMap_void("\tmerge S[%d:%d]\t-> %s\n", ilo, jhi, S)
+		lo  := M.entryv[ilo].Lo
+		hi_ := M.entryv[jhi-1].Hi_
+		vReplaceSlice__RangedMap_void(&M.entryv, ilo,jhi, KeyRange{lo,hi_})
+		debugf_RangedMap_void("\tmerge M[%d:%d]\t-> %s\n", ilo, jhi, M)
 	}
 	jhi = -1 // no longer valid
 
 	// if [r.lo,r.hi) was outside of any entry - create new entry
-	if r.Hi_ < S.rangev[ilo].Lo {
-		vInsert__RangedMap_void(&S.rangev, ilo, r)
-		debugf_RangedMap_void("\tinsert %s\t-> %s\n", r, S)
+	if r.Hi_ < M.entryv[ilo].Lo {
+		vInsert__RangedMap_void(&M.entryv, ilo, r)
+		debugf_RangedMap_void("\tinsert %s\t-> %s\n", r, M)
 	}
 
 	// now we have covered entries merged as needed into [ilo]
 	// extend this entry if r coverage is wider
-	if r.Lo < S.rangev[ilo].Lo {
-		S.rangev[ilo].Lo = r.Lo
-		debugf_RangedMap_void("\textend left\t-> %s\n", S)
+	if r.Lo < M.entryv[ilo].Lo {
+		M.entryv[ilo].Lo = r.Lo
+		debugf_RangedMap_void("\textend left\t-> %s\n", M)
 	}
-	if r.Hi_ > S.rangev[ilo].Hi_ {
-		S.rangev[ilo].Hi_ = r.Hi_
-		debugf_RangedMap_void("\textend right\t-> %s\n", S)
+	if r.Hi_ > M.entryv[ilo].Hi_ {
+		M.entryv[ilo].Hi_ = r.Hi_
+		debugf_RangedMap_void("\textend right\t-> %s\n", M)
 	}
 
 	// and check if we should merge it with right/left neighbours
-	if ilo+1 < len(S.rangev) { // right
-		if S.rangev[ilo].Hi_+1 == S.rangev[ilo+1].Lo {	// XXX && .value same
-			vReplaceSlice__RangedMap_void(&S.rangev, ilo,ilo+2,
-				KeyRange{S.rangev[ilo].Lo, S.rangev[ilo+1].Hi_})
-			debugf_RangedMap_void("\tmerge right\t-> %s\n", S)
+	if ilo+1 < len(M.entryv) { // right
+		if M.entryv[ilo].Hi_+1 == M.entryv[ilo+1].Lo {	// XXX && .value same
+			vReplaceSlice__RangedMap_void(&M.entryv, ilo,ilo+2,
+				KeyRange{M.entryv[ilo].Lo, M.entryv[ilo+1].Hi_})
+			debugf_RangedMap_void("\tmerge right\t-> %s\n", M)
 		}
 	}
 
 	if ilo > 0 { // left
-		if S.rangev[ilo-1].Hi_+1 == S.rangev[ilo].Lo {	// XXX && .value same
-			vReplaceSlice__RangedMap_void(&S.rangev, ilo-1,ilo+1,
-				KeyRange{S.rangev[ilo-1].Lo, S.rangev[ilo].Hi_})
-			debugf_RangedMap_void("\tmerge left\t-> %s\n", S)
+		if M.entryv[ilo-1].Hi_+1 == M.entryv[ilo].Lo {	// XXX && .value same
+			vReplaceSlice__RangedMap_void(&M.entryv, ilo-1,ilo+1,
+				KeyRange{M.entryv[ilo-1].Lo, M.entryv[ilo].Hi_})
+			debugf_RangedMap_void("\tmerge left\t-> %s\n", M)
 		}
 	}