Bugfix of wrong fmt library build handling introduced in #82 (#87)

* Because fmt is now only builded in release mode, we must not handle it the same way regardless of yaramod build type * Preserve debug build of fmt Co-authored-by: Tadeáš Kučera <tadeas.kucera@avast.com>
avast · Mar 25, 2020 · d7cfee7 · d7cfee7
1 parent a3fcdcb
commit d7cfee7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/deps/pog/deps/fmt/CMakeLists.txt b/deps/pog/deps/fmt/CMakeLists.txt
@@ -21,7 +21,7 @@ ExternalProject_Add(
 	SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/fmt"
 	CMAKE_ARGS
 		-DCMAKE_INSTALL_PREFIX=${FMT_INSTALL_DIR}
-		-DCMAKE_BUILD_TYPE=Release
+		-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 		-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
 		-DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
 		-DCMAKE_POSITION_INDEPENDENT_CODE=${POG_PIC}

diff --git a/include/yaramod/types/token_stream.h b/include/yaramod/types/token_stream.h
@@ -31,7 +31,7 @@ class TokenStream
 		std::size_t insertIntoStream(std::stringstream* ss, char what);
 		std::size_t insertIntoStream(std::stringstream* ss, const std::string& what, std::size_t length = 0);
 		std::size_t insertIntoStream(std::stringstream* ss, TokenStream* ts, TokenIt what);
-		std::size_t printComment(std::stringstream* ss, TokenStream* ts, TokenIt it, int currentLineTabs, bool alignComment, bool ignoreUserIndent);
+		std::size_t printComment(std::stringstream* ss, TokenStream* ts, TokenIt it, size_t currentLineTabs, bool alignComment, bool ignoreUserIndent);
 	private:
 		std::size_t lineCounter = 0;
 		std::size_t columnCounter = 0;

diff --git a/src/parser/parser_driver.cpp b/src/parser/parser_driver.cpp
@@ -38,14 +38,14 @@ void ParserDriver::defineTokens()
 		currentFileContext()->getLocation().addColumn(str.length());
 	});
 
-	_parser.token("\r\n").action([&](std::string_view str) -> Value {
+	_parser.token("\r\n").action([&](std::string_view) -> Value {
 		currentFileContext()->getTokenStream()->setNewLineChar("\r\n");
 		TokenIt t = emplace_back(NEW_LINE, "\r\n");
 		_indent.clear();
 		currentFileContext()->getLocation().addLine();
 		return t;
 	});
-	_parser.token("\n").action([&](std::string_view str) -> Value {
+	_parser.token("\n").action([&](std::string_view) -> Value {
 		currentFileContext()->getTokenStream()->setNewLineChar("\n");
 		TokenIt t = emplace_back(NEW_LINE, "\n");
 		_indent.clear();

diff --git a/src/types/token_stream.cpp b/src/types/token_stream.cpp
@@ -485,7 +485,7 @@ std::size_t TokenStream::PrintHelper::insertIntoStream(std::stringstream* ss, To
  *
  * @return columnCounter.
  */
-std::size_t TokenStream::PrintHelper::printComment(std::stringstream* ss, TokenStream* ts, TokenIt it, int currentLineTabs, bool alignComment, bool ignoreUserIndent)
+std::size_t TokenStream::PrintHelper::printComment(std::stringstream* ss, TokenStream* ts, TokenIt it, size_t currentLineTabs, bool alignComment, bool ignoreUserIndent)
 {
 	auto prevIt = ts->predecessor(it);
 	auto indentation = it->getIndentation() + 1;
@@ -542,7 +542,7 @@ void TokenStream::getTextProcedure(PrintHelper& helper, std::stringstream* os, b
 	if (!_formatted)
 		autoformat();
 	BracketStack brackets;
-	int current_line_tabs = 0;
+	size_t current_line_tabs = 0;
 	bool inside_rule = false;
 	bool inside_hex_string = false;
 	bool inside_hex_jump = false;