zeroc-ice 3.6b1

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

@@ -0,0 +1,325 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2014 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>
+#include <IceUtil/FileUtil.h>
+#include <IceUtil/StringUtil.h>
+
+using namespace std;
+using namespace Slice;
+
+string
+Slice::normalizePath(const string& path)
+{
+    string result = path;
+
+    replace(result.begin(), result.end(), '\\', '/');
+
+    string::size_type startReplace = 0;
+#ifdef _WIN32
+    //
+    // For UNC paths we need to ensure they are in the format that is
+    // returned by MCPP. IE. "//MACHINE/PATH"
+    //
+    if(result.find("//") == 0)
+    {
+        startReplace = 2;
+    }
+#endif
+    string::size_type pos;
+    while((pos = result.find("//", startReplace)) != string::npos)
+    {
+        result.replace(pos, 2, "/");
+    }
+    pos = 0;
+    while((pos = result.find("/./", pos)) != string::npos)
+    {
+        result.erase(pos, 2);
+    }
+    pos = 0;
+    while((pos = result.find("/..", pos)) != string::npos)
+    {
+        string::size_type last = result.find_last_of("/", pos - 1);
+        if(last != string::npos && result.substr(last, 4) != "/../")
+        {
+            result.erase(last, pos - last + 3);
+            pos = last;
+        }
+        else
+        {
+            ++pos;
+        }
+    }
+
+    if(result.size() > 1) // Remove trailing "/" or "/."
+    {
+        if(result[result.size() - 1] == '/')
+        {
+            result.erase(result.size() - 1);
+        }
+        else if(result[result.size() - 2] == '/' && result[result.size() - 1] == '.')
+        {
+            result.erase(result.size() - (result.size() == 2 ? 1 : 2));
+        }
+    }
+    return result;
+}
+
+string
+Slice::fullPath(const string& path)
+{
+    string result = path;
+    if(!IceUtilInternal::isAbsolutePath(result))
+    {
+        string cwd;
+        if(IceUtilInternal::getcwd(cwd) == 0)
+        {
+            result = string(cwd) + '/' + result;
+        }
+    }
+
+    return normalizePath(result);
+}
+
+string
+Slice::changeInclude(const string& orig, const vector<string>& includePaths)
+{
+    //
+    // MCPP does not follow symlinks included files so we only
+    // call fullPath on the base directory and not the file itself.
+    //
+    string file = orig;
+    string::size_type pos;
+    if((pos = orig.rfind('/')) != string::npos)
+    {
+        string base = orig.substr(0, pos);
+        file = fullPath(base) + orig.substr(pos);
+    }
+
+    //
+    // Compare each include path against the included file and select
+    // the path that produces the shortest relative filename.
+    //
+    string result = file;
+    for(vector<string>::const_iterator p = includePaths.begin(); p != includePaths.end(); ++p)
+    {
+        if(file.compare(0, p->length(), *p) == 0)
+        {
+            string s = file.substr(p->length() + 1); // + 1 for the '/'
+            if(s.size() < result.size())
+            {
+                result = s;
+            }
+        }
+    }
+
+    if(result == file)
+    {
+        //
+        // Don't return a full path if we couldn't reduce the given path, instead
+        // return the normalized given path.
+        //
+        result = normalizePath(orig);
+    }
+
+    if((pos = result.rfind('.')) != string::npos)
+    {
+        result.erase(pos);
+    }
+
+    return result;
+}
+
+namespace
+{
+
+ostream* errorStream = &cerr;
+
+}
+
+void
+Slice::setErrorStream(ostream& stream)
+{
+    errorStream = &stream;
+}
+
+ostream&
+Slice::getErrorStream()
+{
+    return *errorStream;
+}
+
+void
+Slice::emitError(const string& file, int line, const string& message)
+{
+    if(!file.empty())
+    {
+        *errorStream << file;
+        if(line != -1)
+        {
+            *errorStream << ':' << line;
+        }
+        *errorStream << ": ";
+    }
+    *errorStream << message << endl;
+}
+
+void
+Slice::emitWarning(const string& file, int line, const string& message)
+{
+    if(!file.empty())
+    {
+        *errorStream << file;
+        if(line != -1)
+        {
+            *errorStream << ':' << line;
+        }
+        *errorStream << ": ";
+    }
+    *errorStream << "warning: " << message << endl;
+}
+
+void
+Slice::emitError(const string& file, const std::string& line, const string& message)
+{
+    if(!file.empty())
+    {
+        *errorStream << file;
+        if(!line.empty())
+        {
+            *errorStream << ':' << line;
+        }
+        *errorStream << ": ";
+    }
+    *errorStream << message << endl;
+}
+
+void
+Slice::emitWarning(const string& file, const std::string& line, const string& message)
+{
+    if(!file.empty())
+    {
+        *errorStream << file;
+        if(!line.empty())
+        {
+            *errorStream << ':' << line;
+        }
+        *errorStream << ": ";
+    }
+    *errorStream << "warning: " << message << endl;
+}
+
+void
+Slice::emitRaw(const char* message)
+{
+    *errorStream << message << flush;
+}
+
+vector<string>
+Slice::filterMcppWarnings(const string& message)
+{
+    static const char* messages[] =
+    {
+        "Converted [CR+LF] to [LF]",
+        "no newline, supplemented newline",
+        0
+    };
+
+    static const string warningPrefix = "warning:";
+    static const string fromPrefix = "from";
+    static const string separators = "\n\t ";
+
+    vector<string> in;
+    string::size_type start = 0;
+    string::size_type end;
+    while((end = message.find('\n', start)) != string::npos)
+    {
+        in.push_back(message.substr(start, end - start));
+        start = end + 1;
+    }
+    vector<string> out;
+    bool skipped;
+    for(vector<string>::const_iterator i = in.begin(); i != in.end(); i++)
+    {
+        skipped = false;
+
+        if(i->find(warningPrefix) != string::npos)
+        {
+            for(int j = 0; messages[j] != 0; ++j)
+            {
+                if(i->find(messages[j]) != string::npos)
+                {
+                    // This line should be skipped it contains the unwanted mcpp warning
+                    // next line should also be skipped it contains the slice line that
+                    // produces the skipped warning
+                    i++;
+                    skipped = true;
+                    //
+                    // Check if next lines are still the same warning
+                    //
+                    i++;
+                    while(i != in.end())
+                    {
+                        string token = *i;
+                        string::size_type index = token.find_first_not_of(separators);
+                        if(index != string::npos)
+                        {
+                            token = token.substr(index);
+                        }
+                        if(token.find(fromPrefix) != 0)
+                        {
+                            //
+                            // First line not of this warning
+                            //
+                            i--;
+                            break;
+                        }
+                        else
+                        {
+                            i++;
+                        }
+                    }
+                    break;
+                }
+            }
+            if(i == in.end())
+            {
+                break;
+            }
+        }
+        if(!skipped)
+        {
+            out.push_back(*i + "\n");
+        }
+    }
+    return out;
+}
+
+void
+Slice::printGeneratedHeader(IceUtilInternal::Output& out, const string& path, const string& comment)
+{
+    //
+    // Get only the file name part of the given path.
+    //
+    string file = path;
+    size_t pos = file.find_last_of("/\\");
+    if(string::npos != pos)
+    {
+        file = file.substr(pos + 1);
+    }
+
+    out << comment << " <auto-generated>\n";
+    out << comment << "\n";
+    out << comment << " Generated from file `" << file << "'" << "\n";
+    out << comment << "\n";
+    out << comment << " Warning: do not edit this file." << "\n";
+    out << comment << "\n";
+    out << comment << " </auto-generated>\n";
+    out << comment << "\n";
+}

data/ext/ice/mcpp/config.h.Darwin

@@ -0,0 +1,227 @@
+/* src/config.h.  Generated from config.h.in by configure.  */
+/* src/config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define if '0x5c' in BIG5 multi-byte character is safe. */
+/* #undef BIGFIVE_IS_ESCAPE_FREE */
+
+/* Define the target compiler. */
+#define COMPILER INDEPENDENT
+
+/* Define the type of size_t. */
+/* #undef COMPILER_SP1_VAL */
+
+/* Define the type of ptrdiff_t. */
+/* #undef COMPILER_SP2_VAL */
+
+/* Define the type of wchar_t. */
+/* #undef COMPILER_SP3_VAL */
+
+/* Define the name of COMPILER-specific OLD-style predefined macro. */
+/* #undef COMPILER_SP_OLD */
+
+/* Define the value of COMPILER-specific OLD-style predefined macro. */
+/* #undef COMPILER_SP_OLD_VAL */
+
+/* Define the name of COMPILER-specific STD-style predefined macro. */
+/* #undef COMPILER_SP_STD */
+
+/* Define the value of COMPILER-specific STD-style predefined macro. */
+/* #undef COMPILER_SP_STD_VAL */
+
+/* Define compiler-specific C++ include directory 1. */
+/* #undef CPLUS_INCLUDE_DIR1 */
+
+/* Define compiler-specific C++ include directory 2. */
+/* #undef CPLUS_INCLUDE_DIR2 */
+
+/* Define compiler-specific C++ include directory 3. */
+/* #undef CPLUS_INCLUDE_DIR3 */
+
+/* Define compiler-specific C++ include directory 4. */
+/* #undef CPLUS_INCLUDE_DIR4 */
+
+/* Define the cpu-specific-macro. */
+#define CPU "i386"
+
+/* Define the name of CPU-specific OLD-style predefined macro. */
+/* #undef CPU_SP_OLD */
+
+/* Define the value of CPU-specific OLD-style predefined macro. */
+/* #undef CPU_SP_OLD_VAL */
+
+/* Define the name of CPU-specific STD-style predefined macro. */
+/* #undef CPU_SP_STD */
+
+/* Define the value of CPU-specific STD-style predefined macro. */
+/* #undef CPU_SP_STD_VAL */
+
+/* Define root directory of CYGWIN. */
+/* #undef CYGWIN_ROOT_DIRECTORY */
+
+/* Define compiler-specific C include directory 1. */
+/* #undef C_INCLUDE_DIR1 */
+
+/* Define compiler-specific C include directory 2. */
+/* #undef C_INCLUDE_DIR2 */
+
+/* Define compiler-specific C include directory 3. */
+/* #undef C_INCLUDE_DIR3 */
+
+/* Define if the argument of pragma is macro expanded. */
+/* #undef EXPAND_PRAGMA */
+
+/* Define if the cases of file name are folded. */
+#define FNAME_FOLD 1
+
+/* Define MacOS-specific framework directory 1. */
+#define FRAMEWORK1 "/System/Library/Frameworks"
+
+/* Define MacOS-specific framework directory 2. */
+#define FRAMEWORK2 "/Library/Frameworks"
+
+/* Define MacOS-specific framework directory 3. */
+/* #undef FRAMEWORK3 */
+
+/* Define gcc major version. */
+#define GCC_MAJOR_VERSION "4"
+
+/* Define gcc minor version. */
+#define GCC_MINOR_VERSION "2"
+
+/* Define if digraphs are available. */
+/* #undef HAVE_DIGRAPHS */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if the system has the type `intmax_t'. */
+#define HAVE_INTMAX_T 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if the system has the type `long long'. */
+#define HAVE_LONG_LONG 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdint.h,> header file. */
+/* #undef HAVE_STDINT_H_ */
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `stpcpy' function. */
+#define HAVE_STPCPY 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the <unistd.h,> header file. */
+/* #undef HAVE_UNISTD_H_ */
+
+/* Define the host compiler name. */
+#define HOST_CMP_NAME "GCC"
+
+/* Define the host compiler. */
+#define HOST_COMPILER GNUC
+
+/* Define the host system. */
+#define HOST_SYSTEM SYS_MAC
+
+/* Define include directory to install mcpp_g*.h header files. */
+/* #undef INC_DIR */
+
+/* Define if '0x5c' in ISO2022-JP multi-byte character is safe. */
+/* #undef ISO2022_JP_IS_ESCAPE_FREE */
+
+/* Define output format of line directive. */
+/* #undef LINE_PREFIX */
+
+/* Define printf length modifier for the longest integer. */
+#define LL_FORM "j"
+
+/* Define if build libmcpp */
+#define MCPP_LIB 1
+
+/* Define /mingw directory. */
+/* #undef MINGW_DIRECTORY */
+
+/* Define root directory of MSYS. */
+/* #undef MSYS_ROOT_DIRECTORY */
+
+/* Define the suffix of object file. */
+#define OBJEXT "o"
+
+/* Name of package */
+#define PACKAGE "mcpp"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "kmatsui@t3.rim.or.jp"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "mcpp"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "mcpp 2.7.2"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "mcpp"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "2.7.2"
+
+/* Define include preference. */
+/* #undef SEARCH_INIT */
+
+/* Define if '0x5c' in SJIS multi-byte character is safe. */
+/* #undef SJIS_IS_ESCAPE_FREE */
+
+/* Define the default value of __STDC__. */
+/* #undef STDC */
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define the default value of __STDC_VERSION__. */
+/* #undef STDC_VERSION */
+
+/* Define whether output format of line directive is C source style. */
+/* #undef STD_LINE_PREFIX */
+
+/* Define the target system. */
+#define SYSTEM SYS_MAC
+
+/* Define the version of FreeBSD. */
+/* #undef SYSTEM_EXT_VAL */
+
+/* Define the name of SYSTEM-specific OLD-style predefined macro. */
+/* #undef SYSTEM_SP_OLD */
+
+/* Define the value of SYSTEM-specific OLD-style predefined macro. */
+/* #undef SYSTEM_SP_OLD_VAL */
+
+/* Define the name of SYSTEM-specific STD-style predefined macro. */
+/* #undef SYSTEM_SP_STD */
+
+/* Define the value of SYSTEM-specific STD-style predefined macro. */
+/* #undef SYSTEM_SP_STD_VAL */
+
+/* Version number of package */
+#define VERSION "2.7.2"