core/error.h renamed to except.h

Fix octal excapes in c_escape
Add description and version to Build

diff --git a/Build b/Build
index 63ccdf9f16935bf3952be945eff231a9b7967393..84fd406d077c9acb15e0c6f11d048e6ead7101c0 100644 (file)
--- a/Build
+++ b/Build
@@ -2,6 +2,9 @@
 
 package "mspstrings"
 {
+       description "Mikkosoft Productions string utilities library";
+       version "0.1";
+
        require "mspcore";
 
        library "mspstrings"

diff --git a/source/codec.h b/source/codec.h
index 3470ccc68e6c65ad4890f499a54b41c88fa91256..bb35b0b43528ca4eba14dc66682f43ae26bca651 100644 (file)
--- a/source/codec.h
+++ b/source/codec.h
@@ -9,7 +9,7 @@ Distributed under the LGPL
 #define MSP_STRINGS_CODEC_H_
 
 #include <string>
-#include <msp/core/error.h>
+#include <msp/core/except.h>
 
 namespace Msp {
 namespace Codecs {

diff --git a/source/fmt.cpp b/source/fmt.cpp
index de0d810b8e91d307d2ba844695ebf405e2d1c905..fdd73f3c43b726175f927fe4d0ade866db577315 100644 (file)
--- a/source/fmt.cpp
+++ b/source/fmt.cpp
@@ -4,7 +4,7 @@ This file is part of libmspstrings
 Copyright © 2006-2007 Mikko Rasa
 Distributed under the LGPL
 */
-#include <msp/core/error.h>
+#include <msp/core/except.h>
 #include "fmt.h"
 
 using namespace std;

diff --git a/source/lexicalcast.h b/source/lexicalcast.h
index c73856b8228894374f00b97e2f81dcbcd4532ca2..e67f361faa24429189027515f403f0604c9a0650 100644 (file)
--- a/source/lexicalcast.h
+++ b/source/lexicalcast.h
@@ -10,7 +10,7 @@ Distributed under the LGPL
 
 #include <sstream>
 #include <string>
-#include <msp/core/error.h>
+#include <msp/core/except.h>
 #include "fmt.h"
 
 namespace Msp {

diff --git a/source/regex.cpp b/source/regex.cpp
index 320705e8e33dc1cecbca03a26adab78e9d498805..d3fd0b7ebc4e58b733947387a6e4f349e83bd7ce 100644 (file)
--- a/source/regex.cpp
+++ b/source/regex.cpp
@@ -5,7 +5,7 @@ Copyright © 2007 Mikko Rasa
 Distributed under the LGPL
 */
 #include <stack>
-#include <msp/core/error.h>
+#include <msp/core/except.h>
 #include "formatter.h"
 #include "regex.h"
 

diff --git a/source/regmatch.cpp b/source/regmatch.cpp
index abc5fd4f65dcc50037ffdf4a5630e8d7f532f7d8..852174a0a152baa42ffaaea4ebf724eb7aacb452 100644 (file)
--- a/source/regmatch.cpp
+++ b/source/regmatch.cpp
@@ -4,7 +4,7 @@ This file is part of libmspstrings
 Copyright © 2007 Mikko Rasa
 Distributed under the LGPL
 */
-#include <msp/core/error.h>
+#include <msp/core/except.h>
 #include "regmatch.h"
 
 using namespace std;

diff --git a/source/utils.cpp b/source/utils.cpp
index 9898a07dca5fe52d8511ad71da78c4f5e8b864cb..0318e994e22a6f66eea7a2f03e53660435445b37 100644 (file)
--- a/source/utils.cpp
+++ b/source/utils.cpp
@@ -6,7 +6,7 @@ Distributed under the LGPL
 */
 
 #include <list>
-#include <msp/core/error.h>
+#include <msp/core/except.h>
 #include "utils.h"
 
 using namespace std;
@@ -272,9 +272,9 @@ string c_escape(const string &str, bool escape_8bit)
                        result+="\\\'";
                else if(*i=='\\')
                        result+="\\\\";
-               else if(*i<' ' || (escape_8bit && (*i&0x80)))
+               else if(static_cast<unsigned char>(*i)<' ' || (escape_8bit && (*i&0x80)))
                {
-                       char buf[4]={'\\', (*i>>6)&7, (*i>>3)&7, *i&7};
+                       char buf[4]={'\\', '0'+((*i>>6)&7), '0'+((*i>>3)&7), '0'+(*i&7)};
                        result.append(buf, 4);
                }
                else