b881408ed7
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
83 lines
2.7 KiB
C++
83 lines
2.7 KiB
C++
/*
|
|
* Copyright (c) 2004 The Regents of The University of Michigan
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are
|
|
* met: redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer;
|
|
* redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution;
|
|
* neither the name of the copyright holders nor the names of its
|
|
* contributors may be used to endorse or promote products derived from
|
|
* this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "base/intmath.hh"
|
|
#include "base/range.hh"
|
|
#include "base/str.hh"
|
|
|
|
using namespace std;
|
|
|
|
template <class T>
|
|
bool
|
|
__x_parse_range(const std::string &str, T &first, T &last)
|
|
{
|
|
std::vector<std::string> values;
|
|
tokenize(values, str, ':');
|
|
|
|
T thefirst, thelast;
|
|
|
|
if (values.size() != 2)
|
|
return false;
|
|
|
|
std::string s = values[0];
|
|
std::string e = values[1];
|
|
|
|
if (!to_number(s, thefirst))
|
|
return false;
|
|
|
|
bool increment = (e[0] == '+');
|
|
if (increment)
|
|
e = e.substr(1);
|
|
|
|
if (!to_number(e, thelast))
|
|
return false;
|
|
|
|
if (increment)
|
|
thelast += thefirst - 1;
|
|
|
|
first = thefirst;
|
|
last = thelast;
|
|
|
|
return true;
|
|
}
|
|
|
|
#define RANGE_PARSE(type) \
|
|
template<> bool \
|
|
__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);
|
|
RANGE_PARSE(unsigned long);
|
|
RANGE_PARSE(signed long);
|
|
RANGE_PARSE(unsigned int);
|
|
RANGE_PARSE(signed int);
|
|
RANGE_PARSE(unsigned short);
|
|
RANGE_PARSE(signed short);
|
|
RANGE_PARSE(unsigned char);
|
|
RANGE_PARSE(signed char);
|