To focus the search input from anywhere on the page, press the 'S' key.
in-package search v0.1.0
Merge provides functions to build custom 3-way merge operators for various user-defined contents.
Error (Conflict str).
bind r f is the merge result which behaves as of the application of the function
f to the return value of
bind r f also fails, with the same conflict.
map f m maps the result of a merge. This is the same as
bind m (fun x -> ok (f x)).
'a promise is a function which, when called, will eventually return a value type of
'a. A promise is an optional, lazy and non-blocking value.
val promise : 'a -> 'a promise
promise a is the promise containing
map_promise f a is the promise containing
f applied to what is promised by
bind_promise a f is the promise returned by
f applied to what is promised by
Signature of a merge function.
old is the value of the least-common ancestor.
/----> t1 ----\ ----> old |--> result \----> t2 ----/
Call the merge functions in sequence. Stop as soon as one is not returning a conflict.
Use the merge function defined in another domain. If the converting functions raise any exception the merge is a conflict.
with_conflict f m is
m with the conflict error message modified by
Same as biject but with blocking domain converting functions.
default t is the default merge function for values of type
t. This is a simple merge function which supports changes in one branch at a time:
t1=oldthen the result of the merge is
- otherwise the result is
idempotent t is the default merge function for values of type
t using idempotent operations. It follows the same rules as the
default merge function but also adds:
t1=t2then the result of the merge is
val unit : unit t
unit is the default merge function for unit values.
val bool : bool t
bool is the default merge function for booleans.
val char : char t
char is the default merge function for characters.
val int32 : int32 t
int32 is the default merge function for 32-bits integers.
val int64 : int64 t
int64 the default merge function for 64-bit integers.
val float : float t
float is the default merge function for floating point numbers.
val string : string t
The default string merge function. Do not do anything clever, just compare the strings using the
default merge function.
Lift a merge function to optional values of the same type. If all the provided values are inhabited, then call the provided merge function, otherwise use the same behavior as
Counters and Multisets
The type for counter values. It is expected that the only valid operations on counters are increment and decrement. The following merge functions ensure that the counter semantics are preserved: i.e. it ensures that the number of increments and decrements is preserved.
Maps and Association Lists
We consider the only valid operations for maps and association lists to be:
- Adding a new bindings to the map.
- Removing a binding from the map.
- Replacing an existing binding with a different value.
- Trying to add an already existing binding is a no-op.
We thus assume that no operation on maps is modifying the key names. So the following merge functions ensures that (i) new bindings are preserved (ii) removed bindings stay removed and (iii) modified bindings are merged using the merge function of values.
Note: We only consider sets of bindings, instead of multisets. Application developers should take care of concurrent addition and removal of similar bindings themselves, by using the appropriate multi-sets.
Lift the merge functions to association lists.
Lift the merge functions to maps.