Clean up the Range class and associated usages. The code was

never clear about whether the end of the range was inclusive
or exclusive.  Make it inclusive, but also provide a RangeSize()
function that will generate a Range based on a start and a size.
This, in combination with using the comparison operators, makes
almost all usages of the range not care how it is stored.

base/range.cc:
    Make the end of the range inclusive.

    start/end -> first/last
    (end seems too much like end() in stl)
base/range.hh:
    Make the end of the range inclusive.

    Fix all comparison operators so that they work correctly with
    an inclusive range.  Also, when comparing one range to another
    with <, <=, >, >=, we only look at the beginning of the range
    beacuse x <= y should be the same as x < y || x == y.  (This wasn't
    the case before.)

    Add a few functions for making a range:
    RangeSize is start and size
    RangeEx is start and end where end is exclusive
    RangeIn is start and end where end is inclusive

    start/end -> first/last
    (end seems too much like end() in stl)
dev/alpha_console.cc:
dev/baddev.cc:
dev/ide_ctrl.cc:
dev/ns_gige.cc:
dev/pciconfigall.cc:
dev/pcidev.cc:
dev/tsunami_cchip.cc:
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
dev/uart.cc:
    Use the RangeSize function to create a range.

--HG--
extra : convert_revision : 29a7eb7fce745680f1c77fefff456c2144bc3994

1 files changed, 9 insertions, 9 deletions

diff --git a/base/range.cc b/base/range.cc
index 4453ecc9f..1087c02c8 100644
--- a/base/range.cc
+++ b/base/range.cc
@@ -34,12 +34,12 @@ using namespace std;
 
 template <class T>
 bool
-__x_parse_range(const std::string &str, T &start, T &end)
+__x_parse_range(const std::string &str, T &first, T &last)
 {
     std::vector<std::string> values;
     tokenize(values, str, ':');
 
-    T thestart, theend;
+    T thefirst, thelast;
 
     if (values.size() != 2)
         return false;
@@ -47,29 +47,29 @@ __x_parse_range(const std::string &str, T &start, T &end)
     std::string s = values[0];
     std::string e = values[1];
 
-    if (!to_number(s, thestart))
+    if (!to_number(s, thefirst))
         return false;
 
     bool increment = (e[0] == '+');
     if (increment)
         e = e.substr(1);
 
-    if (!to_number(e, theend))
+    if (!to_number(e, thelast))
         return false;
 
     if (increment)
-        theend += thestart;
+        thelast += thefirst - 1;
 
-    start = thestart;
-    end = theend;
+    first = thefirst;
+    last = thelast;
 
     return true;
 }
 
 #define RANGE_PARSE(type) \
 template<> bool \
-__parse_range(const std::string &s, type &start, type &end) \
-{ return __x_parse_range(s, start, end); }
+__parse_range(const std::string &s, type &first, type &last) \
+{ return __x_parse_range(s, first, last); }
 
 RANGE_PARSE(unsigned long long);
 RANGE_PARSE(signed long long);