v1.06

- Improved JASS syntax support
- Now one-line blocks are supported
- Fixed bug with lambdas
- Fixed string concatenation have been not recognizeble with string constants
- Fixed race condition with logs clean-up
- Added visible progress
- Minor improvements

README.md

@@ -37,7 +37,7 @@ Warcraft III Reforged brought us Lua scripting, but still a lot of map makers fo
 - Read logs if something goes wrong, this application leaves cjass2lua.log file with all it's actions and possible problems. Everything should be fine if you have no warnings.
 
 ### Latest release
-- [v1.05](https://github.com/fullmetal-a/cjass2lua/releases/tag/v1.05)
+- [v1.06](https://github.com/fullmetal-a/cjass2lua/releases/tag/v1.06)
 
 ### Manual
 #### GUI

cJass2Lua/Logger.cpp

@@ -7,7 +7,7 @@
 
 namespace _____LOGGER
 {
-	std::mutex Logger::Writer::_writeMutex;
+	std::recursive_mutex Logger::Writer::_writeMutex;
 
 	std::string _generateTimeStamp()
 	{
@@ -101,13 +101,14 @@ namespace _____LOGGER
 
 	Logger::Writer::Writer(std::string file, const std::string& func, int line, Level level, Logger& logger) : _logger(&logger)
 	{
+		_writeMutex.lock();
+
 		if (level == Logger::Level::Clear)
 		{
 			logger.SetOutputFile(__logFileName);
 			return;
 		}
 
-		_writeMutex.lock();
 		if (file.find("/") != std::string::npos)
 			logger._file = file.substr(file.find_last_of("/") + 1, file.length() - 1);
 		else if (file.find("\\") != std::string::npos)

cJass2Lua/Logger.h

@@ -26,7 +26,7 @@ namespace _____LOGGER
 		{
 		private:
 			Logger*							 _logger;
-			static std::mutex				 _writeMutex;
+			static std::recursive_mutex		_writeMutex;
 
 			Writer(const Writer&)			 = delete;
 			Writer& operator=(const Writer&) = delete;

cJass2Lua/OutputInterface.cpp

@@ -25,6 +25,8 @@ OutputInterface::OutputInterface(Type type, NewLineType nlType, std::string& fil
 	case Type::String:
 		_strPtr = &fileNameOrString;
 		break;
+
+	case Type::FileAndConsole:
 	case Type::File:
 		hFile = CreateFileA(fileNameOrString.c_str(), GENERIC_WRITE, FILE_SHARE_READ, NULL,
 			CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_WRITE_THROUGH, NULL);
@@ -89,6 +91,11 @@ void OutputInterface::_toOutput(const std::string& str)
 	case Type::File:
 		WriteFile(*_file, &str[0], DWORD(str.length()), &dw, NULL);
 		break;
+
+	case Type::FileAndConsole:
+		std::cout << str;
+		WriteFile(*_file, &str[0], DWORD(str.length()), &dw, NULL);
+		break;
 	}
 }
 

cJass2Lua/OutputInterface.h

@@ -25,6 +25,7 @@ class OutputInterface
 		None,
 		File,
 		Console,
+		FileAndConsole,
 		String
 	};
 

cJass2Lua/cJass2Lua.manifest

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+    version="1.0.0.0"
+    processorArchitecture="*"
+    name="CompanyName.ProductName.YourApplication"
+    type="win32"
+/>
+<description>Your application description here.</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="*"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>

cJass2Lua/cJass2Lua.vcxproj

@@ -188,6 +188,9 @@
   <ItemGroup>
     <Image Include="D:\Downloads\main.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="cJass2Lua.manifest" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

cJass2Lua/cJass2Lua.vcxproj.filters

@@ -85,4 +85,7 @@
       <Filter>Файлы ресурсов</Filter>
     </Image>
   </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="cJass2Lua.manifest" />
+  </ItemGroup>
 </Project>