Erase ALL newlines that are directly before and/or conjunctions

avast · Mar 25, 2020 · f604315 · f604315
1 parent ca0c780
commit f604315
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/types/token_stream.cpp b/src/types/token_stream.cpp
@@ -409,7 +409,8 @@ void TokenStream::addMissingNewLines()
 		if (current == NEW_LINE)
 		{
 			if (next == OR || next == AND)
-				it = std::prev(erase(it));
+				while (it->getType() == NEW_LINE)
+					it = std::prev(erase(it));
 			else
 				++lineCounter;
 		}

diff --git a/tests/cpp/parser_tests.cpp b/tests/cpp/parser_tests.cpp
@@ -3128,13 +3128,16 @@ R"(rule rule_1 {
 		any of them
 		or (
 		true
+
+
 		and false)
 }
 
 rule rule_2
 {
 	condition:
 		true
+
 		or
 		false
 }