From 55e95ba8056b88a9a75e1599ac084c1acde850d4 Mon Sep 17 00:00:00 2001
From: lzwdgc <lzwdgc@gmail.com>
Date: Sat, 3 Feb 2024 13:20:21 +0300
Subject: [PATCH] Misc.

---
 src/script2txt2/script2txt2.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/script2txt2/script2txt2.cpp b/src/script2txt2/script2txt2.cpp
index d6c2eb4..0a1da84 100644
--- a/src/script2txt2/script2txt2.cpp
+++ b/src/script2txt2/script2txt2.cpp
@@ -43,7 +43,7 @@ int main(int argc, char *argv[]) {
         // write script
         {
             filename += ".txt";
-            if (std::ofstream ofile(filename); ofile) {
+            if (std::ofstream ofile(filename, std::ios::binary); ofile) {
                 std::string indent, space = "    "s;
                 auto inc = [&]() {
                     indent += space;
@@ -56,12 +56,19 @@ int main(int argc, char *argv[]) {
                     return false;
                 };
                 int procs{};
+                bool prev_newline{};
                 for (auto &&l : lines) {
+                    auto else_ = l == "ELSE"sv;
                     auto proc = l.starts_with("PROC"sv);
                     auto end = l == "END"sv;
                     auto lbrace = l == "{"sv;
                     auto rbrace = l == "}"sv;
 
+                    if (else_ && prev_newline) {
+                        ofile.seekp(-1, std::ios::cur);
+                    }
+                    prev_newline = false;
+
                     if (rbrace) {
                         if (!dec()) {
                             ofile << "// script2txt2 comment: unbalanced!\n";
@@ -75,8 +82,9 @@ int main(int argc, char *argv[]) {
 
                     ofile << indent << l << "\n";
 
-                    if (end && indent.empty()) {
-                        //ofile << "\n";
+                    if ((end || rbrace) && indent.empty()) {
+                        ofile << "\n";
+                        prev_newline = true;
                     }
                     if (end && procs) {
                         procs = 0;