zeroc-ice 3.7.0 → 3.7.5

data/ext/ice/cpp/src/Slice/SliceUtil.cpp

@@ -1,13 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <IceUtil/DisableWarnings.h>
 #include <Slice/Util.h>
 #include <Slice/FileTracker.h>
 #include <IceUtil/FileUtil.h>
@@ -397,7 +391,7 @@ Slice::writeDependencies(const string& dependencies, const string& dependFile)
         if(!of)
         {
             ostringstream os;
-            os << "cannot open file `" << dependFile << "': " << strerror(errno);
+            os << "cannot open file `" << dependFile << "': " << IceUtilInternal::errorToString(errno);
             throw Slice::FileException(__FILE__, __LINE__, os.str());
         }
         of << dependencies;

data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Slice/Util.h>
 
@@ -29,9 +24,12 @@ public:
 
     StringLiteralGenerator(const string&, const string&, EscapeMode, unsigned char);
 
-    string escapeASCIIChar(char) const;
-    string escapeCodePoint(unsigned int) const;
-    string flushU8Buffer(vector<unsigned char>&) const;
+    string escapeASCIIChar(char);
+    string escapeCodePoint(unsigned int);
+    string flushU8Buffer(vector<unsigned char>&);
+
+    enum Format { NoFormat, OctalFormat, HexFormat };
+    void format(Format);
 
 private:
 
@@ -39,6 +37,11 @@ private:
     const string _printableEscaped;
     const EscapeMode _escapeMode;
     const unsigned char _cutOff;
+    const string _shortUCNPrefix;
+    const string _octalChars;
+    const string _hexChars;
+
+    Format _format; // The last format used for an escape.
 };
 
 StringLiteralGenerator::StringLiteralGenerator(const string& nonPrintableEscaped,
@@ -46,19 +49,33 @@ StringLiteralGenerator::StringLiteralGenerator(const string& nonPrintableEscaped
                                                EscapeMode escapeMode,
                                                unsigned char cutOff) :
     _nonPrintableEscaped(nonPrintableEscaped),
-    _printableEscaped(printableEscaped + "\\\""),
+    _printableEscaped(printableEscaped + "\\"),
     _escapeMode(escapeMode),
-    _cutOff(cutOff)
+    _cutOff(cutOff),
+    _shortUCNPrefix(escapeMode == Matlab ? "\\x" : "\\u"),
+    _octalChars("01234567"),
+    _hexChars("01234567890ABCDEFabcdef"),
+    _format(NoFormat)
 {
+    //
+    // Double quotes don't need to be escaped in Matlab because the string delimiter is a single quote.
+    //
+    if(_escapeMode != Matlab)
+    {
+        const_cast<string&>(_printableEscaped) += '"';
+    }
 }
 
 string
-StringLiteralGenerator::escapeASCIIChar(char c) const
+StringLiteralGenerator::escapeASCIIChar(char c)
 {
     assert(static_cast<unsigned char>(c) < 128);
 
     string result;
 
+    Format lastFormat = _format;
+    _format = NoFormat;
+
     if(_nonPrintableEscaped.find(c) != string::npos)
     {
         switch(c)
@@ -125,10 +142,51 @@ StringLiteralGenerator::escapeASCIIChar(char c) const
         result = '\\';
         result += c;
     }
+    else if(_escapeMode == Matlab && c == '\'')
+    {
+        //
+        // Matlab strings are converted by sprintf(), and sprintf() requires a single quote to be escaped
+        // with another single quote.
+        //
+        result = "''";
+    }
+    else if(_escapeMode == Matlab && c == '%')
+    {
+        //
+        // Matlab strings are converted by sprintf(), and sprintf() requires a percent to be escaped
+        // with another percent.
+        //
+        result = "%%";
+    }
     else if(c >= 32 && c <= 126)
     {
-        // Other printable ASCII
-        result = c;
+        //
+        // Other printable ASCII.
+        //
+        if(_escapeMode == Matlab)
+        {
+            //
+            // While interpreting an octal or hex escape, the Matlab parser will continue to consume adjacent
+            // legal characters. If the trailing character after an escaped value could be consumed, we escape it
+            // as well to terminate the original escape.
+            //
+            if((lastFormat == OctalFormat && _octalChars.find(c) != string::npos) ||
+               (lastFormat == HexFormat && _hexChars.find(c) != string::npos))
+            {
+                ostringstream os;
+                os << "\\" << oct << setfill('0') << setw(3) << static_cast<unsigned int>(c & 0xFF);
+                result = os.str();
+                _format = OctalFormat;
+            }
+            else
+            {
+                result = c;
+            }
+        }
+        else
+        {
+            result = c;
+        }
     }
     else
     {
@@ -137,10 +195,17 @@ StringLiteralGenerator::escapeASCIIChar(char c) const
         if((static_cast<unsigned char>(c) < _cutOff) || (_escapeMode == Octal))
         {
             os << "\\" << oct << setfill('0') << setw(3) << static_cast<unsigned int>(c & 0xFF);
+            _format = OctalFormat;
+        }
+        else if(_escapeMode == EC6UCN)
+        {
+            os << "\\u{" << hex << setfill('0') << setw(4) << static_cast<unsigned int>(c & 0xFF) << "}";
+            _format = HexFormat;
         }
         else
         {
-            os << "\\u" << hex << setfill('0') << setw(4) << static_cast<unsigned int>(c & 0xFF);
+            os << _shortUCNPrefix << hex << setfill('0') << setw(4) << static_cast<unsigned int>(c & 0xFF);
+            _format = HexFormat;
         }
         result = os.str();
     }
@@ -148,7 +213,7 @@ StringLiteralGenerator::escapeASCIIChar(char c) const
 }
 
 string
-StringLiteralGenerator::escapeCodePoint(unsigned int codePoint) const
+StringLiteralGenerator::escapeCodePoint(unsigned int codePoint)
 {
     if(codePoint < 128)
     {
@@ -165,35 +230,39 @@ StringLiteralGenerator::escapeCodePoint(unsigned int codePoint) const
         {
             os << "\\" << setfill('0') << setw(3) << oct << static_cast<unsigned int>(*q);
         }
+        _format = OctalFormat;
         return os.str();
     }
     else
     {
         ostringstream os;
-        if(codePoint < _cutOff)
+        if(_escapeMode == EC6UCN)
+        {
+            os << "\\u{" << hex << codePoint << "}";
+        }
+        else if(codePoint < _cutOff)
         {
             //
             // Output octal escape
             //
             os << "\\" << setfill('0') << setw(3) << oct << codePoint;
+            _format = OctalFormat;
         }
         else if(codePoint <= 0xFFFF)
         {
-            os << "\\u" << setfill('0') << setw(4) << hex << codePoint;
+            os << _shortUCNPrefix << setfill('0') << setw(4) << hex << codePoint;
+            _format = HexFormat;
         }
-        else if(_escapeMode == ShortUCN)
+        else if(_escapeMode == ShortUCN || _escapeMode == Matlab)
         {
             //
             // Convert to surrogate pair
             //
             unsigned int highSurrogate = ((codePoint - 0x10000) / 0x400) + 0xD800;
             unsigned int lowSurrogate = ((codePoint - 0x10000) % 0x400) + 0xDC00;
-            os << "\\u" << setfill('0') << setw(4) << hex << highSurrogate;
-            os << "\\u" << setfill('0') << setw(4) << hex << lowSurrogate;
-        }
-        else if(_escapeMode == EC6UCN)
-        {
-            os << "\\u{" << hex << codePoint << "}";
+            os << _shortUCNPrefix << setfill('0') << setw(4) << hex << highSurrogate;
+            os << _shortUCNPrefix << setfill('0') << setw(4) << hex << lowSurrogate;
+            _format = HexFormat;
         }
         else
         {
@@ -204,7 +273,7 @@ StringLiteralGenerator::escapeCodePoint(unsigned int codePoint) const
 }
 
 string
-StringLiteralGenerator::flushU8Buffer(vector<unsigned char>& u8buffer) const
+StringLiteralGenerator::flushU8Buffer(vector<unsigned char>& u8buffer)
 {
     if(u8buffer.empty())
     {
@@ -224,6 +293,12 @@ StringLiteralGenerator::flushU8Buffer(vector<unsigned char>& u8buffer) const
     }
 }
 
+void
+StringLiteralGenerator::format(Format f)
+{
+    _format = f;
+}
+
 }
 
 string
@@ -271,6 +346,7 @@ Slice::toStringLiteral(const string& value,
                         if(c == '\\')
                         {
                             os << "\\\\";
+                            generator.format(StringLiteralGenerator::NoFormat);
                         }
                         else if(c == 'u' || c == 'U')
                         {
@@ -284,11 +360,16 @@ Slice::toStringLiteral(const string& value,
                                 // ASCII character that may need to escaped in languages such as Java
                                 os << generator.escapeASCIIChar(static_cast<char>(v));
                             }
-                            else if(escapeMode == UCN || c == 'u')
+                            else if(escapeMode == UCN)
                             {
                                 // keep this escape as is
                                 os << "\\" << c << codePointStr;
                             }
+                            else if(c == 'u' && escapeMode != EC6UCN)
+                            {
+                                os << (escapeMode == Matlab ? "\\x" : "\\u") << codePointStr;
+                                generator.format(StringLiteralGenerator::HexFormat);
+                            }
                             else
                             {
                                 os << generator.escapeCodePoint(static_cast<unsigned int>(v));
@@ -298,6 +379,7 @@ Slice::toStringLiteral(const string& value,
                         else
                         {
                             // unescaped backslash: escape it!
+                            generator.format(StringLiteralGenerator::NoFormat);
                             os << "\\\\";
                             os << generator.escapeASCIIChar(c);
                         }

data/ext/ice/cpp/src/Slice/Util.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef SLICE_UTIL_H
 #define SLICE_UTIL_H
@@ -31,16 +26,17 @@ std::vector<std::string> argvToArgs(int argc, wchar_t* argv[]);
 std::vector<std::string> argvToArgs(int argc, char* argv[]);
 #endif
 
-enum EscapeMode { UCN, Octal, ShortUCN, EC6UCN };
+enum EscapeMode { UCN, Octal, ShortUCN, Matlab, EC6UCN };
 
 // Parameters:
 // const string& value: input string provided by Slice Parser
 // const string& nonPrintableEscaped: which of \a, \b, \f, \n, \r, \t, \v, \0 (null), \x20 (\s), \x1b (\e) are
 //                                    escaped in the target language
 //                                    Warning: don't include \0 if the target language recognizes octal escapes
-// const string& printableEscaped: additional printable ASCII characters other than \ and " that need to be escaped
+// const string& printableEscaped: additional printable ASCII characters other than \ and the string delimiter
+//                                 that need to be escaped
 // EscapeMode escapeMode: whether we generate both UCNs, octal escape sequences, only short UCNs (\unnnn),
-//                        or ECMAScript 6-style UCNs with \u{...} for astral characters
+//                        Matlab syntax, or ECMAScript 6-style UCNs with \u{...} for astral characters.
 // unsigned char cutOff: characters < cutOff other than the nonPrintableEscaped are generated as
 //                       octal escape sequences, regardless of escapeMode.
 std::string

data/ext/ice/mcpp/Makefile

@@ -1,8 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2015-2017 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# **********************************************************************
 
 PREFIX ?= /opt/mcpp-2.7.2
 
@@ -54,8 +52,7 @@ OBJS = directive.o eval.o expand.o main.o mbchar.o support.o system.o
 
 $(LIBDIR)/libmcpp.a: $(OBJS)
 	-mkdir -p $(LIBDIR)
-	ar rcs $(LIBDIR)/libmcpp.a $(OBJS)
-	ranlib $(LIBDIR)/libmcpp.a
+	$(AR) rcs $(LIBDIR)/libmcpp.a $(OBJS)
 
 install: $(LIBDIR)/libmcpp.a
 	@mkdir -p $(PREFIX)/$(LIBDIR)

data/ice.gemspec

@@ -1,12 +1,10 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# **********************************************************************
 
 Gem::Specification.new do |s|
   s.name        = 'zeroc-ice'
-  s.version     = '3.7.0'
+  s.version     = '3.7.5'
   s.summary     = "ZeroC Ice for Ruby"
   s.description = <<-eos
 The Internet Communications Engine (Ice) provides a robust, proven
@@ -27,7 +25,7 @@ Join us on our user forums if you have questions about Ice.
 eos
   s.authors     = ["ZeroC, Inc."]
   s.email       = 'info@zeroc.com'
-  s.files       = %w[ICE_LICENSE LICENSE MCPP_LICENSE BZIP2_LICENSE ice.gemspec] + Dir.glob('lib/**/*.rb') + Dir.glob("ext/*") + Dir.glob("ext/**/*") + Dir.glob("slice/**/*.ice")
+  s.files       = %w[ICE_LICENSE LICENSE MCPP_LICENSE ice.gemspec] + Dir.glob('lib/**/*.rb') + Dir.glob("ext/*") + Dir.glob("ext/**/*") + Dir.glob("slice/**/*.ice")
   s.homepage    = 'https://zeroc.com'
   s.license     = 'GPL-2.0'
   s.extensions = %w[ext/extconf.rb]

data/lib/Glacier2.rb

@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 require 'Glacier2/Router'
 require 'Glacier2/PermissionsVerifier'

data/lib/Glacier2/Metrics.rb

@@ -1,14 +1,9 @@
 # encoding: utf-8
-# **********************************************************************
 #
-# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
 #
-# **********************************************************************
-#
-# Ice version 3.7.0
+# Ice version 3.7.5
 #
 # <auto-generated>
 #
@@ -22,7 +17,7 @@
 require 'Ice'
 require 'Ice/Metrics.rb'
 
-module IceMX
+module ::IceMX
 
     if not defined?(::IceMX::SessionMetrics_Mixin)
 

data/lib/Glacier2/PermissionsVerifier.rb

@@ -1,14 +1,9 @@
 # encoding: utf-8
-# **********************************************************************
 #
-# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
 #
-# **********************************************************************
-#
-# Ice version 3.7.0
+# Ice version 3.7.5
 #
 # <auto-generated>
 #
@@ -22,7 +17,7 @@
 require 'Ice'
 require 'Glacier2/SSLInfo.rb'
 
-module Glacier2
+module ::Glacier2
 
     if not defined?(::Glacier2::PermissionDeniedException)
         class PermissionDeniedException < Ice::UserException

data/lib/Glacier2/PermissionsVerifierF.rb

@@ -1,14 +1,9 @@
 # encoding: utf-8
-# **********************************************************************
 #
-# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
 #
-# **********************************************************************
-#
-# Ice version 3.7.0
+# Ice version 3.7.5
 #
 # <auto-generated>
 #
@@ -21,7 +16,7 @@
 
 require 'Ice'
 
-module Glacier2
+module ::Glacier2
 
     if not defined?(::Glacier2::T_PermissionsVerifier)
         T_PermissionsVerifier = ::Ice::__declareClass('::Glacier2::PermissionsVerifier')