X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcore%2Futil%2FMultiRangeExpression.cpp;fp=source%2Fcore%2Futil%2FMultiRangeExpression.cpp;h=84e722c6cfab3f567daf1c557ce70cd97b9431e8;hb=17d687f1070485b0b4d7038b7104cb3ab0f45349;hp=3c2307d08d5c11930d8c8ee8a4b8deb02d185012;hpb=0c646b4aa99a84ef6976a51b6d4554aea11ded35;p=anna.git diff --git a/source/core/util/MultiRangeExpression.cpp b/source/core/util/MultiRangeExpression.cpp index 3c2307d..84e722c 100644 --- a/source/core/util/MultiRangeExpression.cpp +++ b/source/core/util/MultiRangeExpression.cpp @@ -114,37 +114,38 @@ std::string anna::MultiRangeExpression::getExpandedLiteral(void) const throw() { //-------------------------------------- MultiRangeExpression::simplifyLiteral() //------------------------------------------------------------------------------ const char * anna::MultiRangeExpression::simplifyLiteral(void) throw() { - - if (a_data.size() == 0) return NULL; + if(a_data.size() == 0) return NULL; std::map < unsigned int, int/*dummy*/ >::const_iterator it; std::map < unsigned int, int/*dummy*/ >::const_iterator it_min(a_data.begin()); std::map < unsigned int, int/*dummy*/ >::const_iterator it_max(a_data.end()); - unsigned int min = UINT_MAX; unsigned int max = 0; unsigned int value; unsigned int prevValue = a_data.begin()->first; - a_literal = ""; for(it = it_min; it != it_max; it++) { value = (*it).first; - if (value < min) min = value; - if (value - prevValue > 1) { + + if(value < min) min = value; + + if(value - prevValue > 1) { a_literal += anna::functions::asString(min); a_literal += "-"; a_literal += anna::functions::asString(max); a_literal += ","; min = value; } - if (value > max) max = value; + + if(value > max) max = value; prevValue = value; } a_literal += anna::functions::asString(min); - if (max != min) { + + if(max != min) { a_literal += "-"; a_literal += anna::functions::asString(max); }