zeroc-ice 3.7.10 → 3.8.0

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

@@ -1,456 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <Slice/Util.h>
-
-#include <IceUtil/InputUtil.h>
-#include <IceUtil/StringConverter.h>
-
-#include <ostream>
-#include <iomanip>
-
-using namespace std;
-using namespace Slice;
-using namespace IceUtil;
-using namespace IceUtilInternal;
-
-namespace
-{
-
-class StringLiteralGenerator
-{
-public:
-
-    StringLiteralGenerator(const string&, const string&, EscapeMode, unsigned char);
-
-    string escapeASCIIChar(char);
-    string escapeCodePoint(unsigned int);
-    string flushU8Buffer(vector<unsigned char>&);
-
-    enum Format { NoFormat, OctalFormat, HexFormat };
-    void format(Format);
-
-private:
-
-    const string _nonPrintableEscaped;
-    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,
-                                               const string& printableEscaped,
-                                               EscapeMode escapeMode,
-                                               unsigned char cutOff) :
-    _nonPrintableEscaped(nonPrintableEscaped),
-    _printableEscaped(printableEscaped + "\\"),
-    _escapeMode(escapeMode),
-    _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)
-{
-    assert(static_cast<unsigned char>(c) < 128);
-
-    string result;
-
-    Format lastFormat = _format;
-    _format = NoFormat;
-
-    if(_nonPrintableEscaped.find(c) != string::npos)
-    {
-        switch(c)
-        {
-            case '\a':
-            {
-                result = "\\a";
-                break;
-            }
-            case '\b':
-            {
-                result = "\\b";
-                break;
-            }
-            case '\f':
-            {
-                result = "\\f";
-                break;
-            }
-            case '\n':
-            {
-                result = "\\n";
-                break;
-            }
-            case '\r':
-            {
-                result = "\\r";
-                break;
-            }
-            case '\t':
-            {
-                result = "\\t";
-                break;
-            }
-            case '\v':
-            {
-                result = "\\v";
-                break;
-            }
-            case '\0':
-            {
-                result = "\\0";
-                break;
-            }
-            case '\x20':
-            {
-                result = "\\s";
-                break;
-            }
-            case '\x1b':
-            {
-                result = "\\e";
-                break;
-            }
-            default:
-            {
-                // The caller cannot add additional non-printable ASCII characters!
-                assert(0);
-            }
-        }
-    }
-    else if(_printableEscaped.find(c) != string::npos)
-    {
-        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.
-        //
-        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
-    {
-        // Other non-printable ASCII character
-        ostringstream os;
-        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 << _shortUCNPrefix << hex << setfill('0') << setw(4) << static_cast<unsigned int>(c & 0xFF);
-            _format = HexFormat;
-        }
-        result = os.str();
-    }
-    return result;
-}
-
-string
-StringLiteralGenerator::escapeCodePoint(unsigned int codePoint)
-{
-    if(codePoint < 128)
-    {
-        return escapeASCIIChar(static_cast<char>(codePoint));
-    }
-    else if(_escapeMode == Octal)
-    {
-        vector<unsigned int> u32buffer;
-        u32buffer.push_back(codePoint);
-        vector<unsigned char> u8buffer = fromUTF32(u32buffer);
-
-        ostringstream os;
-        for(vector<unsigned char>::const_iterator q = u8buffer.begin(); q != u8buffer.end(); ++q)
-        {
-            os << "\\" << setfill('0') << setw(3) << oct << static_cast<unsigned int>(*q);
-        }
-        _format = OctalFormat;
-        return os.str();
-    }
-    else
-    {
-        ostringstream os;
-        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 << _shortUCNPrefix << setfill('0') << setw(4) << hex << codePoint;
-            _format = HexFormat;
-        }
-        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 << _shortUCNPrefix << setfill('0') << setw(4) << hex << highSurrogate;
-            os << _shortUCNPrefix << setfill('0') << setw(4) << hex << lowSurrogate;
-            _format = HexFormat;
-        }
-        else
-        {
-            os << "\\U" << setfill('0') << setw(8) << hex << codePoint;
-        }
-        return os.str();
-    }
-}
-
-string
-StringLiteralGenerator::flushU8Buffer(vector<unsigned char>& u8buffer)
-{
-    if(u8buffer.empty())
-    {
-        return "";
-    }
-    else
-    {
-        ostringstream os;
-        vector<unsigned int> u32buffer = toUTF32(u8buffer);
-
-        for(vector<unsigned int>::const_iterator p = u32buffer.begin(); p != u32buffer.end(); ++p)
-        {
-            os << escapeCodePoint(*p);
-        }
-        u8buffer.clear();
-        return os.str();
-    }
-}
-
-void
-StringLiteralGenerator::format(Format f)
-{
-    _format = f;
-}
-
-}
-
-string
-Slice::toStringLiteral(const string& value,
-                       const string& nonPrintableEscaped,
-                       const string& printableEscaped,
-                       EscapeMode escapeMode,
-                       unsigned char cutOff)
-{
-    StringLiteralGenerator generator(nonPrintableEscaped, printableEscaped, escapeMode, cutOff);
-
-    ostringstream os;
-
-    if(escapeMode != Octal)
-    {
-        vector<unsigned char> u8buffer; // Buffer to convert multibyte characters
-
-        for(size_t i = 0; i < value.size(); ++i)
-        {
-            char c = value[i];
-
-            if(static_cast<unsigned char>(c) >= 128)
-            {
-                // New UTF-8 byte
-                u8buffer.push_back(static_cast<unsigned char>(c));
-            }
-            else
-            {
-                //
-                // First write any outstanding UTF-8 -encoded characters
-                //
-                os << generator.flushU8Buffer(u8buffer);
-
-                if(c == '\\')
-                {
-                    if(i + 1 == value.size())
-                    {
-                        // trailing backslash, add a second one
-                        os << "\\\\";
-                    }
-                    else
-                    {
-                        c = value[++i];
-
-                        if(c == '\\')
-                        {
-                            os << "\\\\";
-                            generator.format(StringLiteralGenerator::NoFormat);
-                        }
-                        else if(c == 'u' || c == 'U')
-                        {
-                            size_t sz = c == 'U' ? 8 : 4;
-                            string codePointStr = value.substr(i + 1, sz);
-                            assert(codePointStr.size() == sz);
-
-                            IceUtil::Int64 v = IceUtilInternal::strToInt64(codePointStr.c_str(), 0, 16);
-                            if(v < 128)
-                            {
-                                // ASCII character that may need to escaped in languages such as Java
-                                os << generator.escapeASCIIChar(static_cast<char>(v));
-                            }
-                            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));
-                            }
-                            i += sz;
-                        }
-                        else
-                        {
-                            // unescaped backslash: escape it!
-                            generator.format(StringLiteralGenerator::NoFormat);
-                            os << "\\\\";
-                            os << generator.escapeASCIIChar(c);
-                        }
-                    }
-                }
-                else
-                {
-                    os << generator.escapeASCIIChar(c);
-                }
-            }
-        }
-
-        //
-        // Write any outstanding UTF-8 -encoded characters
-        //
-        os << generator.flushU8Buffer(u8buffer);
-    }
-    else
-    {
-        assert(escapeMode == Octal);
-
-        for(size_t i = 0; i < value.size(); ++i)
-        {
-            char c = value[i];
-
-            if(static_cast<unsigned char>(c) >= 128)
-            {
-                // Write octal escape
-                os << "\\" << setfill('0') << setw(3) << oct << static_cast<unsigned int>(c & 0xFF);
-            }
-            else if(c == '\\')
-            {
-                if(i + 1 == value.size())
-                {
-                    // trailing backslash, add a second one
-                    os << "\\\\";
-                }
-                else
-                {
-                    c = value[++i];
-
-                    if(c == '\\')
-                    {
-                        os << "\\\\";
-                    }
-                    else if(c == 'u' || c == 'U')
-                    {
-                        //
-                        // Convert code point to UTF-8 bytes and write the escaped bytes
-                        //
-                        size_t sz = c == 'U' ? 8 : 4;
-                        string codePointStr = value.substr(i + 1, sz);
-                        assert(codePointStr.size() == sz);
-
-                        IceUtil::Int64 v = IceUtilInternal::strToInt64(codePointStr.c_str(), 0, 16);
-                        os << generator.escapeCodePoint(static_cast<unsigned int>(v));
-                        i += sz;
-                    }
-                    else
-                    {
-                        // unescaped backslash
-                        os << "\\\\";
-                        os << generator.escapeASCIIChar(c);
-                    }
-                }
-            }
-            else
-            {
-                os << generator.escapeASCIIChar(c);
-            }
-        }
-    }
-    return os.str();
-}

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

@@ -1,50 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifndef SLICE_UTIL_H
-#define SLICE_UTIL_H
-
-#include <Slice/Parser.h>
-#include <IceUtil/OutputUtil.h>
-
-namespace Slice
-{
-
-std::string fullPath(const std::string&);
-std::string changeInclude(const std::string&, const std::vector<std::string>&);
-void emitError(const std::string&, int, const std::string&);
-void emitWarning(const std::string&, int, const std::string&);
-void emitError(const std::string&, const std::string&, const std::string&);
-void emitWarning(const std::string&, const std::string&, const std::string&);
-void emitRaw(const char*);
-std::vector<std::string> filterMcppWarnings(const std::string&);
-void printGeneratedHeader(IceUtilInternal::Output& out, const std::string&, const std::string& commentStyle = "//");
-#ifdef _WIN32
-std::vector<std::string> argvToArgs(int argc, wchar_t* argv[]);
-#else
-std::vector<std::string> argvToArgs(int argc, char* argv[]);
-#endif
-
-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 the string delimiter
-//                                 that need to be escaped
-// EscapeMode escapeMode: whether we generate both UCNs, octal escape sequences, only short UCNs (\unnnn),
-//                        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
-toStringLiteral(const std::string&, const std::string&, const std::string&, EscapeMode, unsigned char);
-
-void
-writeDependencies(const std::string&, const std::string&);
-
-}
-
-#endif

data/ext/ice/mcpp/CMakeLists.txt

@@ -1,80 +0,0 @@
-cmake_minimum_required(VERSION 3.7.2)
-
-if(APPLE)
-	set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum macOS deployment version")
-endif()
-
-# handle debug lib naming based on shipped project naming
-if(NOT CMAKE_DEBUG_POSTFIX)
-	set(CMAKE_DEBUG_POSTFIX d)
-endif()
-
-project(mcpp VERSION 2.7.2.14)
-
-add_library(mcpp STATIC
-	"config.h"
-	"configed.H"
-	"directive.c"
-	"eval.c"
-	"expand.c"
-	"internal.H"
-	"main.c"
-	"mbchar.c"
-	"support.c"
-	"system.c"
-	"system.H"
-)
-
-target_sources(mcpp PUBLIC
-	"${CMAKE_CURRENT_SOURCE_DIR}/mcpp_lib.h"
-	"${CMAKE_CURRENT_SOURCE_DIR}/mcpp_out.h"
-)
-
-if(UNIX)
-	include(GNUInstallDirs)
-    
-	set_property(TARGET mcpp PROPERTY PUBLIC_HEADER 
-		"mcpp_lib.h" 
-		"mcpp_out.h"
-	)
-
-	target_compile_options(mcpp PRIVATE "-O2")
-
-	if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-		set_property(TARGET mcpp PROPERTY POSITION_INDEPENDENT_CODE ON)
-
-		target_compile_options(mcpp PRIVATE
-			"-Wno-maybe-uninitialized"
-			"-Wno-unused-result"
-		)
-	endif()
-
-	install(TARGETS mcpp
-		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-		PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-	)
-elseif(WIN32)
-	# define character set - not set, per shipped project files
-	add_definitions(-D_SBCS)
-    
-	target_compile_definitions(mcpp PRIVATE
-		"_WIN32_WINNT=0x600"
-		"WIN32_LEAN_AND_MEAN"
-	)
-
-	if(MSVC)
-		target_compile_definitions(mcpp PRIVATE
-			"_CRT_SECURE_NO_WARNINGS"
-		)
-
-		target_compile_options(mcpp PRIVATE
-			"/wd4996"
-			"/wd4244"
-			"/wd4246"
-			"/wd4267"
-			"/wd4146"
-			"/wd4018"
-		)
-	endif()
-endif()
-install(TARGETS mcpp DESTINATION lib)

data/ext/ice/mcpp/LICENSE

@@ -1,29 +0,0 @@
-/*-
- * Copyright (c) 1998, 2002-2008 Kiyoshi Matsui <kmatsui@t3.rim.or.jp>
- * All rights reserved.
- *
- * This software including the files in this directory is provided under
- * the following license.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-

data/ext/ice/mcpp/Makefile

@@ -1,63 +0,0 @@
-#
-# Copyright (c) ZeroC, Inc. All rights reserved.
-#
-
-PREFIX ?= /opt/mcpp-2.7.2
-
-ifeq ($(CFLAGS),)
-	CFLAGS = -O2
-endif
-
-UNAME = $(shell uname)
-MACHINE = $(shell uname -m)
-
-LIBDIR = lib
-
-ifeq ($(UNAME),Darwin)
-        override CFLAGS += -mmacosx-version-min=10.9
-endif
-
-ifeq ($(UNAME),Linux)
-        override CFLAGS += -fPIC -Wno-maybe-uninitialized -Wno-implicit-function-declaration -Wno-unused-result
-
-        ifeq ($(MACHINE),i686)
-                override CFLAGS += -m32
-                #
-                # Ubuntu.
-                #
-                ifeq ($(shell test -d /usr/lib/i386-linux-gnu && echo 0),0)
-                        LIBDIR = lib/i386-linux-gnu
-                endif
-        else
-                #
-                # Ubuntu.
-                #
-                ifeq ($(shell test -d /usr/lib/x86_64-linux-gnu && echo 0),0)
-                        LIBDIR = lib/x86_64-linux-gnu
-                endif
-                #
-                # Rhel/SLES
-                #
-                ifeq ($(shell test -d /usr/lib64 && echo 0),0)
-                        LIBDIR = lib64
-                endif
-        endif
-endif
-
-ifeq ($(UNAME),AIX)
-        CC ?= xlc_r
-endif
-
-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)
-
-install: $(LIBDIR)/libmcpp.a
-	@mkdir -p $(PREFIX)/$(LIBDIR)
-	cp $(LIBDIR)/libmcpp.a $(PREFIX)/$(LIBDIR)
-
-clean:
-	rm -f $(OBJS)
-	rm -rf $(LIBDIR)