Merge remote-tracking branch 'origin/3.6'

2 files changed, 82 insertions, 13 deletions

diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp
index 2838863454a..35117e68f36 100644
--- a/cpp/src/slice2php/Main.cpp
+++ b/cpp/src/slice2php/Main.cpp
@@ -16,6 +16,7 @@
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/Mutex.h>
 #include <IceUtil/MutexPtrLock.h>
+#include <IceUtil/Unicode.h>
 #include <Slice/Checksum.h>
 #include <Slice/Preprocessor.h>
 #include <Slice/FileTracker.h>
@@ -1273,9 +1274,10 @@ CodeVisitor::writeConstantValue(const TypePtr& type, const SyntaxTreeBasePtr& va
 
                 _out << "\"";                                       // Opening "
 
-                for(string::const_iterator c = value.begin(); c != value.end(); ++c)
+                for(size_t i = 0; i < value.size();)
                 {
-                    switch(*c)
+                    char c = value[i];
+                    switch(c)
                     {
                     case '$':
                     {
@@ -1289,8 +1291,79 @@ CodeVisitor::writeConstantValue(const TypePtr& type, const SyntaxTreeBasePtr& va
                     }
                     case '\\':
                     {
-                        _out << "\\\\";
-                        break;
+
+                        string s = "\\";
+                        size_t j = i + 1;
+                        for(; j < value.size(); ++j)
+                        {
+                            if(value[j] != '\\')
+                            {
+                                break;
+                            }
+                            s += "\\";
+                        }
+
+                        //
+                        // An even number of slash \ will escape the backslash and
+                        // the codepoint will be interpreted as its charaters
+                        //
+                        // \\u00000041  - ['\\', 'u', '0', '0', '0', '0', '0', '0', '4', '1']
+                        // \\\u00000041 - ['\\', 'A'] (41 is the codepoint for 'A')
+                        //
+                        if(s.size() % 2 != 0 && (value[j] == 'U' || value[j] == 'u'))
+                        {
+                            //
+                            // Convert codepoint to UTF8 bytes and write the escaped bytes
+                            //
+                            _out << s.substr(0, s.size() - 1);
+
+                            size_t sz = value[j] == 'U' ? 8 : 4;
+                            string codepoint = value.substr(j + 1, sz);
+                            assert(codepoint.size() ==  sz);
+
+                            IceUtil::Int64 v = IceUtilInternal::strToInt64(codepoint.c_str(), 0, 16);
+
+
+                            vector<unsigned int> u32buffer;
+                            u32buffer.push_back(static_cast<unsigned int>(v));
+
+                            vector<unsigned char> u8buffer;
+
+                            IceUtilInternal::ConversionResult result = convertUTF32ToUTF8(u32buffer, u8buffer, IceUtil::lenientConversion);
+                            switch(result)
+                            {
+                                case conversionOK:
+                                    break;
+                                case sourceExhausted:
+                                    throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "string source exhausted");
+                                case sourceIllegal:
+                                    throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "string source illegal");
+                                default:
+                                {
+                                    assert(0);
+                                    throw IceUtil::IllegalConversionException(__FILE__, __LINE__);
+                                }
+                            }
+
+                            ostringstream s;
+                            for(vector<unsigned char>::const_iterator q = u8buffer.begin(); q != u8buffer.end(); ++q)
+                            {
+                                s << "\\";
+                                s.fill('0');
+                                s.width(3);
+                                s << oct;
+                                s << static_cast<unsigned int>(*q);
+                            }
+                            _out << s.str();
+
+                            i = j + 1 + sz;
+                        }
+                        else
+                        {
+                            _out << s;
+                            i = j;
+                        }
+                        continue;
                     }
                     case '\r':
                     {
@@ -1307,11 +1380,6 @@ CodeVisitor::writeConstantValue(const TypePtr& type, const SyntaxTreeBasePtr& va
                         _out << "\\t";
                         break;
                     }
-                    case '\b':
-                    {
-                        _out << "\\b";
-                        break;
-                    }
                     case '\f':
                     {
                         _out << "\\f";
@@ -1319,9 +1387,9 @@ CodeVisitor::writeConstantValue(const TypePtr& type, const SyntaxTreeBasePtr& va
                     }
                     default:
                     {
-                        if(charSet.find(*c) == charSet.end())
+                        if(charSet.find(c) == charSet.end())
                         {
-                            unsigned char uc = *c;              // Char may be signed, so make it positive.
+                            unsigned char uc = c;              // Char may be signed, so make it positive.
                             stringstream s;
                             s << "\\";                          // Print as octal if not in basic source character set.
                             s.flags(ios_base::oct);
@@ -1332,11 +1400,12 @@ CodeVisitor::writeConstantValue(const TypePtr& type, const SyntaxTreeBasePtr& va
                         }
                         else
                         {
-                            _out << *c;                         // Print normally if in basic source character set.
+                            _out << c;                          // Print normally if in basic source character set.
                         }
                         break;
                     }
                     }
+                    ++i;
                 }
 
                 _out << "\"";                                   // Closing "
diff --git a/cpp/src/slice2php/Makefile b/cpp/src/slice2php/Makefile
index 8bc91a8cd66..62f82531201 100644
--- a/cpp/src/slice2php/Makefile
+++ b/cpp/src/slice2php/Makefile
@@ -19,7 +19,7 @@ RPATH_DIR	= $(LOADER_PATH)/../$(libsubdir)
 
 include $(top_srcdir)/config/Make.rules
 
-CPPFLAGS	:= -I. $(CPPFLAGS)
+CPPFLAGS	:= -I. -I.. $(CPPFLAGS)
 
 $(NAME): $(OBJS)
 	rm -f $@