Exception changes in strings/utils.cpp
authorMikko Rasa <tdb@tdb.fi>
Thu, 9 Jun 2011 14:07:55 +0000 (17:07 +0300)
committerMikko Rasa <tdb@tdb.fi>
Thu, 9 Jun 2011 14:07:55 +0000 (17:07 +0300)
source/strings/utils.cpp

index 93bbbbf2ae81d3c073b2abe3320029108ccd45ba..fff6cdb290362cb724b96b61c29f68c5970dfe0c 100644 (file)
@@ -1,6 +1,6 @@
 #include <algorithm>
 #include <list>
-#include <msp/core/except.h>
+#include <stdexcept>
 #include "utils.h"
 
 using namespace std;
@@ -148,7 +148,7 @@ string c_unescape(const std::string &str)
                        else if(*i>='A' && *i<='F')
                                digit = *i-'A'+10;
                        else
-                               throw InvalidParameterValue("Invalid hexadecimal digit");
+                               throw invalid_argument("c_unescape");
 
                        numeric_value = (numeric_value<<4 | digit);
                        ++numeric_pos;
@@ -164,7 +164,7 @@ string c_unescape(const std::string &str)
                        if(*i>='0' && *i<='7')
                                digit = *i-'0';
                        else
-                               throw InvalidParameterValue("Invalid octal digit");
+                               throw invalid_argument("c_unescape");
 
                        numeric_value = (numeric_value<<3 | digit);
                        ++numeric_pos;
@@ -209,7 +209,7 @@ string c_unescape(const std::string &str)
                        else if(*i=='\\')
                                result += '\\';
                        else
-                               throw InvalidParameterValue("Invalid escape sequence");
+                               throw invalid_argument("c_unescape");
 
                        escape = false;
                }
@@ -220,7 +220,7 @@ string c_unescape(const std::string &str)
        }
 
        if(escape)      
-               throw InvalidParameterValue("Stray backslash at end of string");
+               throw invalid_argument("c_unescape");
 
        return result;
 }