From 53e22b11857fed62e2313d6d84d90f88ed412ffb Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Mon, 29 Jul 2013 12:13:03 +0100 Subject: Changed everyting to Unix line endings. --- Tools/ToLuaDoxy/Globals.cpp | 20 +- Tools/ToLuaDoxy/Globals.h | 202 +++++++++--------- Tools/ToLuaDoxy/ToLuaDoxy.cpp | 444 +++++++++++++++++++-------------------- Tools/ToLuaDoxy/ToLuaDoxy.sln | 40 ++-- Tools/ToLuaDoxy/ToLuaDoxy.vcproj | 442 +++++++++++++++++++------------------- 5 files changed, 574 insertions(+), 574 deletions(-) (limited to 'Tools/ToLuaDoxy') diff --git a/Tools/ToLuaDoxy/Globals.cpp b/Tools/ToLuaDoxy/Globals.cpp index 31440fd44..d73265a60 100644 --- a/Tools/ToLuaDoxy/Globals.cpp +++ b/Tools/ToLuaDoxy/Globals.cpp @@ -1,10 +1,10 @@ - -// Globals.cpp - -// Used for precompiled header generation in MSVC - -#include "Globals.h" - - - - + +// Globals.cpp + +// Used for precompiled header generation in MSVC + +#include "Globals.h" + + + + diff --git a/Tools/ToLuaDoxy/Globals.h b/Tools/ToLuaDoxy/Globals.h index 1b92a1349..b9100a297 100644 --- a/Tools/ToLuaDoxy/Globals.h +++ b/Tools/ToLuaDoxy/Globals.h @@ -1,101 +1,101 @@ - -// Globals.h - -// This file is used for precompiled header generation in MSVC - - - - -// OS-dependent stuff: -#ifdef _WIN32 - #define WIN32_LEAN_AND_MEAN - - #define _WIN32_WINNT 0x501 // We want to target WinXP and higher - - #include - #include - #include // IPv6 stuff - - // Windows SDK defines min and max macros, messing up with our std::min and std::max usage - #undef min - #undef max - - // Windows SDK defines GetFreeSpace as a constant, probably a Win16 API remnant - #ifdef GetFreeSpace - #undef GetFreeSpace - #endif // GetFreeSpace -#else - #include - #include // for mkdir - #include - #include - #include - #include - #include - #include - #include - #include - #include - - #include - #include - #include - #include - #include - #include - - #if !defined(ANDROID_NDK) - #include - #endif -#endif - - - - - -// CRT stuff: -#include -#include -#include -#include - - - - - -// STL stuff: -#include -#include -#include -#include -#include -#include -#include -#include -#include - - - - - -// Common headers (part 1, without macros): -#include "../../source/StringUtils.h" - - - - - -// Common definitions: - -/// Evaluates to the number of elements in an array (compile-time!) -#define ARRAYCOUNT(X) (sizeof(X) / sizeof(*(X))) - -/// Allows arithmetic expressions like "32 KiB" (but consider using parenthesis around it, "(32 KiB)" ) -#define KiB * 1024 -#define MiB * 1024 * 1024 - -#define ASSERT assert - - - - + +// Globals.h + +// This file is used for precompiled header generation in MSVC + + + + +// OS-dependent stuff: +#ifdef _WIN32 + #define WIN32_LEAN_AND_MEAN + + #define _WIN32_WINNT 0x501 // We want to target WinXP and higher + + #include + #include + #include // IPv6 stuff + + // Windows SDK defines min and max macros, messing up with our std::min and std::max usage + #undef min + #undef max + + // Windows SDK defines GetFreeSpace as a constant, probably a Win16 API remnant + #ifdef GetFreeSpace + #undef GetFreeSpace + #endif // GetFreeSpace +#else + #include + #include // for mkdir + #include + #include + #include + #include + #include + #include + #include + #include + #include + + #include + #include + #include + #include + #include + #include + + #if !defined(ANDROID_NDK) + #include + #endif +#endif + + + + + +// CRT stuff: +#include +#include +#include +#include + + + + + +// STL stuff: +#include +#include +#include +#include +#include +#include +#include +#include +#include + + + + + +// Common headers (part 1, without macros): +#include "../../source/StringUtils.h" + + + + + +// Common definitions: + +/// Evaluates to the number of elements in an array (compile-time!) +#define ARRAYCOUNT(X) (sizeof(X) / sizeof(*(X))) + +/// Allows arithmetic expressions like "32 KiB" (but consider using parenthesis around it, "(32 KiB)" ) +#define KiB * 1024 +#define MiB * 1024 * 1024 + +#define ASSERT assert + + + + diff --git a/Tools/ToLuaDoxy/ToLuaDoxy.cpp b/Tools/ToLuaDoxy/ToLuaDoxy.cpp index cadb4b32e..8b692bb75 100644 --- a/Tools/ToLuaDoxy/ToLuaDoxy.cpp +++ b/Tools/ToLuaDoxy/ToLuaDoxy.cpp @@ -1,222 +1,222 @@ - -// ToLuaDoxy.cpp - -// Implements the main app entrypoint - -#include "Globals.h" -#include -#include - - - - - -typedef std::vector AStrings; - - - - - -class cProcessor -{ -public: - cProcessor(const AString & a_FileOut) : - m_Out(a_FileOut.c_str(), std::ios::out), - m_IsInToLua(false), - m_IsInComment(false) - { - } - - - bool IsGood(void) const - { - return !m_Out.fail(); - } - - - void ProcessFile(const AString & a_FileIn) - { - std::ifstream In(a_FileIn.c_str()); - if (In.fail()) - { - std::cerr << "Cannot open input file " << a_FileIn << "." << std::endl; - return; - } - while (!In.eof()) - { - AString Line; - std::getline(In, Line); - PushLine(Line); - } - } - -protected: - std::ofstream m_Out; - bool m_IsInToLua; ///< Set to true if inside a tolua_begin .. tolua_end block - bool m_IsInComment; ///< Set to true if previous line has started a multiline comment; only outside tolua blocks - AString m_LastComment; ///< Accumulator for a multiline comment preceding a tolua block - - - void PushLine(const AString & a_Line) - { - if (m_IsInToLua) - { - // Inside a tolua block - if (TrimString(a_Line) == "// tolua_end") - { - // End of a tolua block - m_IsInToLua = false; - return; - } - m_Out << a_Line << std::endl; - return; - } - - if (m_IsInComment) - { - // Inside a multiline comment block, outside of a tolua block; accumulate m_LastComment - m_LastComment += a_Line + "\n"; - m_IsInComment = (a_Line.find("*/") == AString::npos); - return; - } - - AString Trimmed(TrimString(a_Line)); - - if (Trimmed == "// tolua_begin") - { - // Beginning of a tolua block - m_IsInToLua = true; - if (!m_LastComment.empty()) - { - m_Out << m_LastComment << std::endl; - m_LastComment.clear(); - } - return; - } - - size_t CommentBegin = a_Line.find("/*"); - if (CommentBegin != AString::npos) - { - m_IsInComment = (a_Line.find("*/", CommentBegin) == AString::npos); - m_LastComment = a_Line; - } - - size_t ExportIdx = a_Line.find("// tolua_export"); - if (ExportIdx != AString::npos) - { - // Single-line tolua block - - // Strip the export comment and right-trim the line: - AString Stripped(a_Line.substr(0, ExportIdx)); - int End = Stripped.length() - 1; - while ((End > 0) && (Stripped[End] <= 32)) - { - End--; - } - Stripped.erase(End + 1); - - if (!m_LastComment.empty()) - { - m_Out << m_LastComment << std::endl; - m_LastComment.clear(); - } - m_Out << Stripped << std::endl; - return; - } - - if (!m_IsInComment) - { - m_LastComment.clear(); - } - } -} ; - - - - - -/** Parses the specified package file into a list of $cfile-included files and all the other contents -Returns true if successful. -Returns false and prints error if unsuccessful -*/ -bool ParsePackageFile(const AString & a_FileName, AStrings & a_CFiles, AStrings & a_DirectContentsLines) -{ - std::ifstream PkgFile(a_FileName.c_str()); - if (PkgFile.fail()) - { - std::cerr << "Cannot open the package file " << a_FileName << "." << std::endl; - return false; - } - - while (!PkgFile.eof()) - { - AString Line; - std::getline(PkgFile, Line); - Line = TrimString(Line); - if (strncmp(Line.c_str(), "$cfile \"", 8) == 0) - { - a_CFiles.push_back(Line.substr(8, Line.length() - 9)); - } - else - { - a_DirectContentsLines.push_back(Line); - } - } - return true; -} - - - - - -/// Processes the specified input header file into the output file -void ProcessCFile(const AString & a_CFileIn, const AString & a_CFileOut) -{ - cProcessor p(a_CFileOut); - if (!p.IsGood()) - { - std::cerr << "Cannot open output file " << a_CFileOut << "." << std::endl; - return; - } - p.ProcessFile(a_CFileIn); -} - - - - - -int main(int argc, char * argv[]) -{ - AString BaseDir = (argc > 1) ? argv[1] : "."; - AString OutDir = (argc > 2) ? argv[2] : "Out"; - - // Create the output directory: - #ifdef _WIN32 - CreateDirectory(OutDir.c_str(), NULL); - #else - mkdir(OutDir.c_str(), S_IRWXU | S_IRWXG | S_IRWXO); - #endif - - // Parse the package file - AStrings CFiles; - AStrings DirectLines; - if (!ParsePackageFile(Printf("%s/AllToLua.pkg", BaseDir.c_str()), CFiles, DirectLines)) - { - return 1; - } - - // Process header files: - for (AStrings::const_iterator itr = CFiles.begin(), end = CFiles.end(); itr != end; ++itr) - { - static int cnt = 0; - AString In = Printf("%s/%s", BaseDir.c_str(), itr->c_str()); - AString Out = Printf("%s/%04x.h", OutDir.c_str(), cnt++); - ProcessCFile(In, Out); - } // for itr - CFiles[] - - return 0; -} - - - - + +// ToLuaDoxy.cpp + +// Implements the main app entrypoint + +#include "Globals.h" +#include +#include + + + + + +typedef std::vector AStrings; + + + + + +class cProcessor +{ +public: + cProcessor(const AString & a_FileOut) : + m_Out(a_FileOut.c_str(), std::ios::out), + m_IsInToLua(false), + m_IsInComment(false) + { + } + + + bool IsGood(void) const + { + return !m_Out.fail(); + } + + + void ProcessFile(const AString & a_FileIn) + { + std::ifstream In(a_FileIn.c_str()); + if (In.fail()) + { + std::cerr << "Cannot open input file " << a_FileIn << "." << std::endl; + return; + } + while (!In.eof()) + { + AString Line; + std::getline(In, Line); + PushLine(Line); + } + } + +protected: + std::ofstream m_Out; + bool m_IsInToLua; ///< Set to true if inside a tolua_begin .. tolua_end block + bool m_IsInComment; ///< Set to true if previous line has started a multiline comment; only outside tolua blocks + AString m_LastComment; ///< Accumulator for a multiline comment preceding a tolua block + + + void PushLine(const AString & a_Line) + { + if (m_IsInToLua) + { + // Inside a tolua block + if (TrimString(a_Line) == "// tolua_end") + { + // End of a tolua block + m_IsInToLua = false; + return; + } + m_Out << a_Line << std::endl; + return; + } + + if (m_IsInComment) + { + // Inside a multiline comment block, outside of a tolua block; accumulate m_LastComment + m_LastComment += a_Line + "\n"; + m_IsInComment = (a_Line.find("*/") == AString::npos); + return; + } + + AString Trimmed(TrimString(a_Line)); + + if (Trimmed == "// tolua_begin") + { + // Beginning of a tolua block + m_IsInToLua = true; + if (!m_LastComment.empty()) + { + m_Out << m_LastComment << std::endl; + m_LastComment.clear(); + } + return; + } + + size_t CommentBegin = a_Line.find("/*"); + if (CommentBegin != AString::npos) + { + m_IsInComment = (a_Line.find("*/", CommentBegin) == AString::npos); + m_LastComment = a_Line; + } + + size_t ExportIdx = a_Line.find("// tolua_export"); + if (ExportIdx != AString::npos) + { + // Single-line tolua block + + // Strip the export comment and right-trim the line: + AString Stripped(a_Line.substr(0, ExportIdx)); + int End = Stripped.length() - 1; + while ((End > 0) && (Stripped[End] <= 32)) + { + End--; + } + Stripped.erase(End + 1); + + if (!m_LastComment.empty()) + { + m_Out << m_LastComment << std::endl; + m_LastComment.clear(); + } + m_Out << Stripped << std::endl; + return; + } + + if (!m_IsInComment) + { + m_LastComment.clear(); + } + } +} ; + + + + + +/** Parses the specified package file into a list of $cfile-included files and all the other contents +Returns true if successful. +Returns false and prints error if unsuccessful +*/ +bool ParsePackageFile(const AString & a_FileName, AStrings & a_CFiles, AStrings & a_DirectContentsLines) +{ + std::ifstream PkgFile(a_FileName.c_str()); + if (PkgFile.fail()) + { + std::cerr << "Cannot open the package file " << a_FileName << "." << std::endl; + return false; + } + + while (!PkgFile.eof()) + { + AString Line; + std::getline(PkgFile, Line); + Line = TrimString(Line); + if (strncmp(Line.c_str(), "$cfile \"", 8) == 0) + { + a_CFiles.push_back(Line.substr(8, Line.length() - 9)); + } + else + { + a_DirectContentsLines.push_back(Line); + } + } + return true; +} + + + + + +/// Processes the specified input header file into the output file +void ProcessCFile(const AString & a_CFileIn, const AString & a_CFileOut) +{ + cProcessor p(a_CFileOut); + if (!p.IsGood()) + { + std::cerr << "Cannot open output file " << a_CFileOut << "." << std::endl; + return; + } + p.ProcessFile(a_CFileIn); +} + + + + + +int main(int argc, char * argv[]) +{ + AString BaseDir = (argc > 1) ? argv[1] : "."; + AString OutDir = (argc > 2) ? argv[2] : "Out"; + + // Create the output directory: + #ifdef _WIN32 + CreateDirectory(OutDir.c_str(), NULL); + #else + mkdir(OutDir.c_str(), S_IRWXU | S_IRWXG | S_IRWXO); + #endif + + // Parse the package file + AStrings CFiles; + AStrings DirectLines; + if (!ParsePackageFile(Printf("%s/AllToLua.pkg", BaseDir.c_str()), CFiles, DirectLines)) + { + return 1; + } + + // Process header files: + for (AStrings::const_iterator itr = CFiles.begin(), end = CFiles.end(); itr != end; ++itr) + { + static int cnt = 0; + AString In = Printf("%s/%s", BaseDir.c_str(), itr->c_str()); + AString Out = Printf("%s/%04x.h", OutDir.c_str(), cnt++); + ProcessCFile(In, Out); + } // for itr - CFiles[] + + return 0; +} + + + + diff --git a/Tools/ToLuaDoxy/ToLuaDoxy.sln b/Tools/ToLuaDoxy/ToLuaDoxy.sln index 8df530779..2d8e78b1b 100644 --- a/Tools/ToLuaDoxy/ToLuaDoxy.sln +++ b/Tools/ToLuaDoxy/ToLuaDoxy.sln @@ -1,20 +1,20 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C++ Express 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ToLuaDoxy", "ToLuaDoxy.vcproj", "{137140AF-4E9D-404F-BC87-982A6517AC12}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {137140AF-4E9D-404F-BC87-982A6517AC12}.Debug|Win32.ActiveCfg = Debug|Win32 - {137140AF-4E9D-404F-BC87-982A6517AC12}.Debug|Win32.Build.0 = Debug|Win32 - {137140AF-4E9D-404F-BC87-982A6517AC12}.Release|Win32.ActiveCfg = Release|Win32 - {137140AF-4E9D-404F-BC87-982A6517AC12}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual C++ Express 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ToLuaDoxy", "ToLuaDoxy.vcproj", "{137140AF-4E9D-404F-BC87-982A6517AC12}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {137140AF-4E9D-404F-BC87-982A6517AC12}.Debug|Win32.ActiveCfg = Debug|Win32 + {137140AF-4E9D-404F-BC87-982A6517AC12}.Debug|Win32.Build.0 = Debug|Win32 + {137140AF-4E9D-404F-BC87-982A6517AC12}.Release|Win32.ActiveCfg = Release|Win32 + {137140AF-4E9D-404F-BC87-982A6517AC12}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Tools/ToLuaDoxy/ToLuaDoxy.vcproj b/Tools/ToLuaDoxy/ToLuaDoxy.vcproj index 0c9f4ec5b..cd4c89cee 100644 --- a/Tools/ToLuaDoxy/ToLuaDoxy.vcproj +++ b/Tools/ToLuaDoxy/ToLuaDoxy.vcproj @@ -1,221 +1,221 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3