X-Git-Url: http://git.vrable.net/?p=cumulus.git;a=blobdiff_plain;f=ref.cc;h=4418e1552cb736d601836ef9be2df26736b7e6cb;hp=bed4dafb8c07a6c13670ec7e911f19692129f956;hb=f38dd9bcb0caffd3fc9126b05788c936690e8288;hpb=915e73b3fa1f245541611f26268cdd574798e1e2 diff --git a/ref.cc b/ref.cc index bed4daf..4418e15 100644 --- a/ref.cc +++ b/ref.cc @@ -25,6 +25,7 @@ #include #include +#include #include #include #include @@ -97,7 +98,9 @@ string ObjectReference::to_string() const if (range_valid) { char buf[64]; - if (range_start == 0) { + if (range_exact) { + sprintf(buf, "[=%zu]", range_length); + } else if (type == REF_ZERO) { sprintf(buf, "[%zu]", range_length); } else { sprintf(buf, "[%zu+%zu]", range_start, range_length); @@ -159,10 +162,16 @@ ObjectReference ObjectReference::parse(const std::string& str) } // Range - bool have_range = false; + bool have_range = false, range_exact = false; int64_t range1 = 0, range2 = 0; if (*t == '[') { t++; + + if (*t == '=') { + range_exact = true; + t++; + } + s = t; while (*t >= '0' && *t <= '9') t++; @@ -174,6 +183,8 @@ ObjectReference ObjectReference::parse(const std::string& str) } else { if (*t != '+') return ObjectReference(); + if (range_exact) + return ObjectReference(); string val(s, t - s); range1 = atoll(val.c_str()); @@ -208,7 +219,7 @@ ObjectReference ObjectReference::parse(const std::string& str) ref.set_checksum(checksum); if (have_range) - ref.set_range(range1, range2); + ref.set_range(range1, range2, range_exact); return ref; } @@ -238,6 +249,9 @@ bool ObjectReference::merge(ObjectReference ref) 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;