formatting for persistent-vector.sml (absolutely no changes other than formatting)
This commit is contained in:
@@ -104,10 +104,7 @@ struct
|
||||
val prevFinish = Vector.sub (sizes, Vector.length sizes - 1)
|
||||
val start = start - prevFinish
|
||||
val finish = finish - prevFinish
|
||||
val newNode = LEAF
|
||||
( #[{start = start, finish = finish}]
|
||||
, #[finish]
|
||||
)
|
||||
val newNode = LEAF (#[{start = start, finish = finish}], #[finish])
|
||||
in
|
||||
APPEND newNode
|
||||
end
|
||||
@@ -125,11 +122,8 @@ struct
|
||||
case helpAppend (start, finish, tree) of
|
||||
UPDATE t => t
|
||||
| APPEND newNode =>
|
||||
let
|
||||
val maxSize = getFinishIdx tree
|
||||
in
|
||||
BRANCH
|
||||
(#[tree, newNode], #[maxSize, finish])
|
||||
let val maxSize = getFinishIdx tree
|
||||
in BRANCH (#[tree, newNode], #[maxSize, finish])
|
||||
end
|
||||
|
||||
fun getStart tree =
|
||||
@@ -350,10 +344,8 @@ struct
|
||||
case tree of
|
||||
BRANCH (nodes, _) => getFirstItem (Vector.sub (nodes, 0))
|
||||
| LEAF (items, _) =>
|
||||
if Vector.length items = 0 then
|
||||
{start = ~1, finish = ~1}
|
||||
else
|
||||
Vector.sub (items, 0)
|
||||
if Vector.length items = 0 then {start = ~1, finish = ~1}
|
||||
else Vector.sub (items, 0)
|
||||
|
||||
fun getMaxSize tree =
|
||||
case tree of
|
||||
@@ -372,9 +364,8 @@ struct
|
||||
Vector.sub (sizes, Vector.length sizes - 1)
|
||||
else
|
||||
0
|
||||
val result =
|
||||
splitLeft
|
||||
(offset - prevSize, Vector.sub (nodes, Vector.length nodes - 1))
|
||||
val result = splitLeft (offset - prevSize, Vector.sub
|
||||
(nodes, Vector.length nodes - 1))
|
||||
in
|
||||
if isEmpty result then
|
||||
let
|
||||
@@ -389,8 +380,10 @@ struct
|
||||
else
|
||||
let
|
||||
val newChildSize = getMaxSize result + prevSize
|
||||
val sizes = Vector.update (sizes, Vector.length sizes - 1, newChildSize)
|
||||
val nodes = Vector.update (nodes, Vector.length nodes - 1, result)
|
||||
val sizes = Vector.update
|
||||
(sizes, Vector.length sizes - 1, newChildSize)
|
||||
val nodes = Vector.update
|
||||
(nodes, Vector.length nodes - 1, result)
|
||||
in
|
||||
BRANCH (nodes, sizes)
|
||||
end
|
||||
@@ -398,11 +391,7 @@ struct
|
||||
else
|
||||
let
|
||||
val idx = BinSearch.equalOrMore (offset, sizes)
|
||||
val prevSize =
|
||||
if idx > 1 then
|
||||
Vector.sub (sizes, idx - 1)
|
||||
else
|
||||
0
|
||||
val prevSize = if idx > 1 then Vector.sub (sizes, idx - 1) else 0
|
||||
val result = splitLeft (offset - prevSize, Vector.sub (nodes, idx))
|
||||
in
|
||||
if isEmpty result then
|
||||
@@ -418,20 +407,11 @@ struct
|
||||
else
|
||||
let
|
||||
val len = idx + 1
|
||||
val sizes = Vector.tabulate (len,
|
||||
fn i =>
|
||||
if i = idx then
|
||||
getMaxSize result + prevSize
|
||||
else
|
||||
Vector.sub (sizes, i)
|
||||
)
|
||||
val nodes = Vector.tabulate (len,
|
||||
fn i =>
|
||||
if i = idx then
|
||||
result
|
||||
else
|
||||
Vector.sub (nodes, i)
|
||||
)
|
||||
val sizes = Vector.tabulate (len, fn i =>
|
||||
if i = idx then getMaxSize result + prevSize
|
||||
else Vector.sub (sizes, i))
|
||||
val nodes = Vector.tabulate (len, fn i =>
|
||||
if i = idx then result else Vector.sub (nodes, i))
|
||||
in
|
||||
BRANCH (nodes, sizes)
|
||||
end
|
||||
@@ -474,7 +454,8 @@ struct
|
||||
val len = Vector.length sizes - 1
|
||||
|
||||
val sizeSlice = VectorSlice.slice (sizes, 1, SOME len)
|
||||
val sizes = VectorSlice.map (fn el => el - firstSizeBefore) sizeSlice
|
||||
val sizes =
|
||||
VectorSlice.map (fn el => el - firstSizeBefore) sizeSlice
|
||||
|
||||
val nodeSlice = VectorSlice.slice (nodes, 1, SOME len)
|
||||
val nodes = VectorSlice.vector nodeSlice
|
||||
@@ -486,12 +467,10 @@ struct
|
||||
val firstSizeAfter = getMaxSize result
|
||||
val sizeDiff = firstSizeBefore - firstSizeAfter
|
||||
|
||||
val sizes = Vector.mapi (fn (idx, el) =>
|
||||
if idx = 0 then
|
||||
firstSizeAfter
|
||||
else
|
||||
el - sizeDiff
|
||||
) sizes
|
||||
val sizes =
|
||||
Vector.mapi
|
||||
(fn (idx, el) =>
|
||||
if idx = 0 then firstSizeAfter else el - sizeDiff) sizes
|
||||
|
||||
val nodes = Vector.update (nodes, 0, result)
|
||||
in
|
||||
@@ -547,11 +526,7 @@ struct
|
||||
val len = Vector.length sizes - idx
|
||||
val len = SOME len
|
||||
|
||||
val prevSize =
|
||||
if idx < 1 then
|
||||
0
|
||||
else
|
||||
Vector.sub (sizes, idx - 1)
|
||||
val prevSize = if idx < 1 then 0 else Vector.sub (sizes, idx - 1)
|
||||
val sizes = VectorSlice.slice (sizes, idx, len)
|
||||
val sizes = VectorSlice.map (fn i => i - prevSize) sizes
|
||||
|
||||
@@ -559,8 +534,7 @@ struct
|
||||
val items =
|
||||
VectorSlice.map
|
||||
(fn {start, finish} =>
|
||||
{start = start - prevSize, finish = finish - prevSize})
|
||||
items
|
||||
{start = start - prevSize, finish = finish - prevSize}) items
|
||||
in
|
||||
LEAF (items, sizes)
|
||||
end
|
||||
@@ -581,9 +555,10 @@ struct
|
||||
let
|
||||
val nodes = Vector.concat [leftNodes, rightNodes]
|
||||
val maxLeftSize = Vector.sub (leftSizes, Vector.length leftSizes - 1)
|
||||
val sizes = Vector.tabulate
|
||||
(Vector.length leftSizes + Vector.length rightSizes,
|
||||
fn i =>
|
||||
val sizes =
|
||||
Vector.tabulate
|
||||
( Vector.length leftSizes + Vector.length rightSizes
|
||||
, fn i =>
|
||||
if i < Vector.length leftSizes then
|
||||
Vector.sub (leftSizes, i)
|
||||
else
|
||||
@@ -597,31 +572,27 @@ struct
|
||||
let
|
||||
val maxLeftSize = Vector.sub (leftSizes, Vector.length leftSizes - 1)
|
||||
val len = Vector.length leftItems + Vector.length rightItems
|
||||
val items =
|
||||
Vector.tabulate (len,
|
||||
fn i =>
|
||||
val items = Vector.tabulate (len, fn i =>
|
||||
if i < Vector.length leftItems then
|
||||
Vector.sub (leftItems, i)
|
||||
else
|
||||
let
|
||||
val {start, finish} = Vector.sub (rightItems, i - Vector.length leftItems)
|
||||
val {start, finish} = Vector.sub
|
||||
(rightItems, i - Vector.length leftItems)
|
||||
in
|
||||
{start = start + maxLeftSize, finish = finish + maxLeftSize}
|
||||
end
|
||||
)
|
||||
val sizes =
|
||||
Vector.tabulate (len,
|
||||
fn i =>
|
||||
end)
|
||||
val sizes = Vector.tabulate (len, fn i =>
|
||||
if i < Vector.length leftSizes then
|
||||
Vector.sub (leftSizes, i)
|
||||
else
|
||||
Vector.sub (rightSizes, i - Vector.length leftSizes)
|
||||
+ maxLeftSize
|
||||
)
|
||||
Vector.sub (rightSizes, i - Vector.length leftSizes) + maxLeftSize)
|
||||
in
|
||||
LEAF (items, sizes)
|
||||
end
|
||||
| _ => raise Fail "PersistentVector.joinSameDepth: one is BRANCH and other is LEAF"
|
||||
| _ =>
|
||||
raise Fail
|
||||
"PersistentVector.joinSameDepth: one is BRANCH and other is LEAF"
|
||||
|
||||
datatype append_join_result =
|
||||
APPEND_JOIN_APPEND of t
|
||||
@@ -640,15 +611,14 @@ struct
|
||||
let
|
||||
val nodes = Vector.concat [nodes, rightNodes]
|
||||
|
||||
val lastLeftSize = Vector.sub (sizes, Vector.length sizes - 1)
|
||||
val sizes = Vector.tabulate (Vector.length nodes,
|
||||
fn i =>
|
||||
val lastLeftSize = Vector.sub
|
||||
(sizes, Vector.length sizes - 1)
|
||||
val sizes = Vector.tabulate (Vector.length nodes, fn i =>
|
||||
if i < Vector.length sizes then
|
||||
Vector.sub (sizes, i)
|
||||
else
|
||||
Vector.sub (rightSizes, i - Vector.length sizes)
|
||||
+ lastLeftSize
|
||||
)
|
||||
+ lastLeftSize)
|
||||
in
|
||||
APPEND_JOIN_UPDATE (BRANCH (nodes, sizes))
|
||||
end
|
||||
@@ -656,8 +626,7 @@ struct
|
||||
raise Fail
|
||||
"persistent-vector.sml appendJoin: \
|
||||
\expected to join when left and right are both BRANCH \
|
||||
\but left is BRANCH and right is LEAF"
|
||||
)
|
||||
\but left is BRANCH and right is LEAF")
|
||||
else
|
||||
(* recursion case: join below *)
|
||||
let
|
||||
@@ -668,8 +637,7 @@ struct
|
||||
APPEND_JOIN_UPDATE newLast =>
|
||||
let
|
||||
val prevSize =
|
||||
if lastIdx > 0 then Vector.sub (sizes, lastIdx - 1)
|
||||
else 0
|
||||
if lastIdx > 0 then Vector.sub (sizes, lastIdx - 1) else 0
|
||||
val newLastSize = getMaxSize newLast + prevSize
|
||||
val sizes = Vector.update (sizes, lastIdx, newLastSize)
|
||||
val nodes = Vector.update (nodes, lastIdx, newLast)
|
||||
@@ -680,11 +648,11 @@ struct
|
||||
if Vector.length nodes = maxSize then
|
||||
(* parent has to append insead as this node
|
||||
* would exceed capacity if appended here *)
|
||||
APPEND_JOIN_APPEND (BRANCH (#[newNode], #[getMaxSize newNode]))
|
||||
APPEND_JOIN_APPEND (BRANCH
|
||||
(#[newNode], #[getMaxSize newNode]))
|
||||
else
|
||||
let
|
||||
val prevSize =
|
||||
Vector.sub (sizes, Vector.length sizes - 1)
|
||||
val prevSize = Vector.sub (sizes, Vector.length sizes - 1)
|
||||
val newNodeSize = #[getMaxSize newNode + prevSize]
|
||||
val sizes = Vector.concat [sizes, newNodeSize]
|
||||
|
||||
@@ -705,25 +673,24 @@ struct
|
||||
val leftMaxSize = Vector.sub (sizes, Vector.length sizes - 1)
|
||||
|
||||
val newLen = Vector.length items + Vector.length rightItems
|
||||
val items = Vector.tabulate (newLen,
|
||||
fn i =>
|
||||
val items = Vector.tabulate (newLen, fn i =>
|
||||
if i < Vector.length items then
|
||||
Vector.sub (items, i)
|
||||
else
|
||||
let
|
||||
val {start, finish} = Vector.sub (rightItems, i - Vector.length items)
|
||||
val {start, finish} = Vector.sub
|
||||
(rightItems, i - Vector.length items)
|
||||
in
|
||||
{start = start + leftMaxSize, finish = finish + leftMaxSize}
|
||||
end
|
||||
)
|
||||
val sizes = Vector.tabulate (newLen,
|
||||
fn i =>
|
||||
{ start = start + leftMaxSize
|
||||
, finish = finish + leftMaxSize
|
||||
}
|
||||
end)
|
||||
val sizes = Vector.tabulate (newLen, fn i =>
|
||||
if i < Vector.length sizes then
|
||||
Vector.sub (sizes, i)
|
||||
else
|
||||
Vector.sub (rightSizes, i - Vector.length sizes)
|
||||
+ leftMaxSize
|
||||
)
|
||||
+ leftMaxSize)
|
||||
in
|
||||
APPEND_JOIN_UPDATE (LEAF (items, sizes))
|
||||
end
|
||||
@@ -731,8 +698,7 @@ struct
|
||||
raise Fail
|
||||
"persistent-vector.sml appendJoin: \
|
||||
\left is LEAF and expected right to also be LEAF \
|
||||
\but right is BRANCH"
|
||||
)
|
||||
\but right is BRANCH")
|
||||
|
||||
datatype prepend_join_result =
|
||||
PREPEND_JOIN_PREPEND of t
|
||||
@@ -750,16 +716,14 @@ struct
|
||||
BRANCH (leftNodes, leftSizes) =>
|
||||
let
|
||||
val nodes = Vector.concat [leftNodes, rightNodes]
|
||||
val maxLeftSize =
|
||||
Vector.sub (leftSizes, Vector.length leftSizes - 1)
|
||||
val sizes = Vector.tabulate (Vector.length nodes,
|
||||
fn i =>
|
||||
val maxLeftSize = Vector.sub
|
||||
(leftSizes, Vector.length leftSizes - 1)
|
||||
val sizes = Vector.tabulate (Vector.length nodes, fn i =>
|
||||
if i < Vector.length leftSizes then
|
||||
Vector.sub (leftSizes, i)
|
||||
else
|
||||
Vector.sub (rightSizes, i - Vector.length leftSizes)
|
||||
+ maxLeftSize
|
||||
)
|
||||
+ maxLeftSize)
|
||||
in
|
||||
PREPEND_JOIN_UPDATE (BRANCH (nodes, sizes))
|
||||
end
|
||||
@@ -767,8 +731,7 @@ struct
|
||||
raise Fail
|
||||
"persistent-vector.sml prependJoin: \
|
||||
\expected left and right to be BRANCH \
|
||||
\but right is BRANCH while left is LEAF"
|
||||
)
|
||||
\but right is BRANCH while left is LEAF")
|
||||
else
|
||||
(* recursive case *)
|
||||
let
|
||||
@@ -787,19 +750,16 @@ struct
|
||||
end
|
||||
| PREPEND_JOIN_PREPEND newFirst =>
|
||||
if Vector.length rightSizes = maxSize then
|
||||
PREPEND_JOIN_PREPEND (BRANCH (#[newFirst], #[getMaxSize newFirst]))
|
||||
PREPEND_JOIN_PREPEND (BRANCH
|
||||
(#[newFirst], #[getMaxSize newFirst]))
|
||||
else
|
||||
let
|
||||
val nodes = Vector.concat [#[newFirst], rightNodes]
|
||||
val newFirstSize = getMaxSize newFirst
|
||||
|
||||
val sizes = Vector.tabulate (Vector.length nodes,
|
||||
fn i =>
|
||||
if i = 0 then
|
||||
newFirstSize
|
||||
else
|
||||
Vector.sub (rightSizes, i - 1) + newFirstSize
|
||||
)
|
||||
val sizes = Vector.tabulate (Vector.length nodes, fn i =>
|
||||
if i = 0 then newFirstSize
|
||||
else Vector.sub (rightSizes, i - 1) + newFirstSize)
|
||||
in
|
||||
PREPEND_JOIN_UPDATE (BRANCH (nodes, sizes))
|
||||
end)
|
||||
@@ -812,27 +772,27 @@ struct
|
||||
(case left of
|
||||
LEAF (leftItems, leftSizes) =>
|
||||
let
|
||||
val maxLeftSize = Vector.sub (leftSizes, Vector.length leftSizes - 1)
|
||||
val maxLeftSize = Vector.sub
|
||||
(leftSizes, Vector.length leftSizes - 1)
|
||||
val len = Vector.length leftSizes + Vector.length rightItems
|
||||
val sizes = Vector.tabulate (len,
|
||||
fn i =>
|
||||
val sizes = Vector.tabulate (len, fn i =>
|
||||
if i < Vector.length leftSizes then
|
||||
Vector.sub (leftSizes, i)
|
||||
else
|
||||
Vector.sub (rightSizes, i - Vector.length leftSizes)
|
||||
+ maxLeftSize)
|
||||
val items = Vector.tabulate (len,
|
||||
fn i =>
|
||||
val items = Vector.tabulate (len, fn i =>
|
||||
if i < Vector.length leftItems then
|
||||
Vector.sub (leftItems, i)
|
||||
else
|
||||
let
|
||||
val {start, finish} =
|
||||
Vector.sub (rightItems, i - Vector.length leftItems)
|
||||
val {start, finish} = Vector.sub
|
||||
(rightItems, i - Vector.length leftItems)
|
||||
in
|
||||
{start = start + maxLeftSize, finish = finish + maxLeftSize}
|
||||
end
|
||||
)
|
||||
{ start = start + maxLeftSize
|
||||
, finish = finish + maxLeftSize
|
||||
}
|
||||
end)
|
||||
in
|
||||
PREPEND_JOIN_UPDATE (LEAF (items, sizes))
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user