+ // Abbreviated-length only range?
+ if (*t == ']') {
+ string val(s, t - s);
+ range2 = atoll(val.c_str());
+ } else {
+ if (*t != '+')
+ return ObjectReference();
+ if (range_exact)
+ return ObjectReference();
+
+ string val(s, t - s);
+ range1 = atoll(val.c_str());
+
+ t++;
+ s = t;
+ while (*t >= '0' && *t <= '9')
+ t++;
+ if (*t != ']')
+ return ObjectReference();
+
+ val = string(s, t - s);
+ range2 = atoll(val.c_str());
+ }
+
+ have_range = true;
+ }
+
+ ObjectReference ref;
+ switch (type) {
+ case ObjectReference::REF_ZERO:
+ ref = ObjectReference(ObjectReference::REF_ZERO);
+ break;
+ case ObjectReference::REF_NORMAL:
+ ref = ObjectReference(segment, object);
+ break;
+ default:
+ return ObjectReference();
+ }
+
+ if (checksum.size() > 0)
+ ref.set_checksum(checksum);
+
+ if (have_range)
+ ref.set_range(range1, range2, range_exact);
+
+ return ref;
+}
+
+/* Attempt to merge a new object reference into the current one. Returns a
+ * boolean indicating success; if successful this reference is modified so that
+ * it refers to the range of bytes originally covered by this reference plus
+ * the reference passed in. Merging only succeeds if both references refer to
+ * the same object and the byte ranges are contiguous. */
+bool ObjectReference::merge(ObjectReference ref)
+{
+ // Exception: We can always merge into a null object
+ if (is_null()) {
+ *this = ref;
+ return true;
+ }
+
+ if (segment != ref.segment)
+ return false;
+ if (object != ref.object)
+ return false;
+
+ // TODO: Allow the case where only one checksum was filled in
+ if (checksum_valid != ref.checksum_valid || checksum != ref.checksum)
+ return false;
+
+ if (!range_valid || !ref.range_valid)
+ return false;
+
+ if (range_exact || ref.range_exact)
+ return false;
+
+ if (range_start + range_length == ref.range_start) {
+ range_length += ref.range_length;
+ return true;
+ } else {
+ return false;
+ }