X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcore%2Futil%2FMultiRangeExpression.cpp;h=bd4818bb25466df0615ccbfb3bd1a8920a2b374e;hb=e14f6ba5183403d7bbf589ef87b0643b12a0f72c;hp=84e722c6cfab3f567daf1c557ce70cd97b9431e8;hpb=17d687f1070485b0b4d7038b7104cb3ab0f45349;p=anna.git diff --git a/source/core/util/MultiRangeExpression.cpp b/source/core/util/MultiRangeExpression.cpp index 84e722c..bd4818b 100644 --- a/source/core/util/MultiRangeExpression.cpp +++ b/source/core/util/MultiRangeExpression.cpp @@ -1,37 +1,9 @@ -// ANNA - Anna is Not Nothingness Anymore -// -// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo -// -// http://redmine.teslayout.com/projects/anna-suite -// -// 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 holder 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. -// -// Authors: eduardo.ramos.testillano@gmail.com -// cisco.tierra@gmail.com +// ANNA - Anna is Not Nothingness Anymore // +// // +// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo // +// // +// See project site at http://redmine.teslayout.com/projects/anna-suite // +// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE // // Local @@ -52,7 +24,7 @@ //------------------------------------------------------------------------------ //---------------------------------------------- MultiRangeExpression::refresh() //------------------------------------------------------------------------------ -void anna::MultiRangeExpression::refresh(void) throw() { +void anna::MultiRangeExpression::refresh(void) { anna::Tokenizer ranges, borders; anna::Tokenizer::const_iterator ranges_it, borders_it; std::string range; @@ -91,7 +63,7 @@ void anna::MultiRangeExpression::refresh(void) throw() { //------------------------------------------------------------------------------ //----------------------------------- MultiRangeExpression::getExpandedLiteral() //------------------------------------------------------------------------------ -std::string anna::MultiRangeExpression::getExpandedLiteral(void) const throw() { +std::string anna::MultiRangeExpression::getExpandedLiteral(void) const { std::string result; std::map < unsigned int, int/*dummy*/ >::const_iterator it; std::map < unsigned int, int/*dummy*/ >::const_iterator it_min(a_data.begin()); @@ -113,7 +85,7 @@ std::string anna::MultiRangeExpression::getExpandedLiteral(void) const throw() { //------------------------------------------------------------------------------ //-------------------------------------- MultiRangeExpression::simplifyLiteral() //------------------------------------------------------------------------------ -const char * anna::MultiRangeExpression::simplifyLiteral(void) throw() { +const char * anna::MultiRangeExpression::simplifyLiteral(void) { if(a_data.size() == 0) return NULL; std::map < unsigned int, int/*dummy*/ >::const_iterator it;