bugfixes

compiler.cpp

@@ -205,7 +205,8 @@ int Compiler::compileAndExecute(const QString &cc, const QStringList &options, c
         while (!exe.waitForFinished(50)) {
             auto exeout = exe.readAll();
             if (!exeout.isEmpty()) {
-                print() << exeout << flush;
+                // stdout raw data
+                std::cout << exeout.data() << std::flush;
             }
 
 #ifdef Q_OS_WIN
@@ -219,7 +220,8 @@ int Compiler::compileAndExecute(const QString &cc, const QStringList &options, c
             }
             qApp->processEvents();
         }
-        print() << exe.readAll() << flush;
+        // stdout raw data
+        std::cout << exe.readAll().data() << std::flush;
     }
 
     QFile::remove(aoutName());
@@ -244,9 +246,10 @@ int Compiler::compileFileAndExecute(const QString &path)
     }
 
     QTextStream ts(&srcFile);
+    ts.setEncoding(QStringConverter::System);
     QString src = ts.readLine().trimmed();  // read first line
 
-    if (src.startsWith("#!")) {
+    if (src.startsWith("#!")) {  // check shebang
         src = ts.readAll();
     } else {
         src += "\n";

main.cpp

@@ -152,15 +152,9 @@ static void showHelp()
 
 static void showConfigs(const QSettings &conf)
 {
-    QStringList confkeys;
-    confkeys << "CXX"
-             << "CXXFLAGS"
-             << "LDFLAGS"
-             << "COMMON_INCLUDES";
-
-    QStringList configs = conf.allKeys();
-    for (QStringListIterator it(conf.allKeys()); it.hasNext();) {
-        const QString &key = it.next();
+    const QStringList confkeys {"CXX", "CXXFLAGS", "LDFLAGS", "COMMON_INCLUDES"};
+
+    for (auto &key : conf.allKeys()) {
         if (confkeys.contains(key))
             printf("%s=%s\n", qPrintable(key), qPrintable(conf.value(key).toString()));
     }
@@ -274,7 +268,8 @@ static QString readLine()
     std::string s;
 
     if (std::getline(std::cin, s)) {
-        line = QString::fromStdString(s);
+        // Countermeasure for garbled characters in windows
+        line = QString::fromLocal8Bit(QByteArray::fromStdString(s));
     }
     return line;
 }
@@ -287,9 +282,9 @@ static int interpreter()
     print() << "Loaded INI file: " << conf->fileName() << endl;
     print().flush();
 
-    QStringList includes = conf->value("COMMON_INCLUDES").toString().split(" ", SkipEmptyParts);
-    for (QStringListIterator i(includes); i.hasNext();) {
-        QString s = i.next().trimmed();
+    const QStringList includes = conf->value("COMMON_INCLUDES").toString().split(" ", SkipEmptyParts);
+    for (auto s : includes) {
+        s = s.trimmed();
         if (!s.isEmpty()) {
             if (s.startsWith("<") || s.startsWith('"')) {
                 headers << QString("#include ") + s;
@@ -340,11 +335,10 @@ static int interpreter()
         if (line.startsWith(".del ") || line.startsWith(".rm ")) {  // Deletes code
             int n = line.indexOf(' ');
             line.remove(0, n + 1);
-            QStringList list = line.split(QRegularExpression("[,\\s]"), SkipEmptyParts);
+            const QStringList list = line.split(QRegularExpression("[,\\s]"), SkipEmptyParts);
 
             std::list<int> numbers;  // line-numbers
-            for (QStringListIterator it(list); it.hasNext();) {
-                const QString &s = it.next();
+            for (auto &s : list) {
                 bool ok;
                 int n = s.toInt(&ok);
                 if (ok && n > 0)
@@ -444,6 +438,7 @@ int main(int argv, char *argc[])
     } else if (QCoreApplication::arguments().contains("-")) {  // Check pipe option
         QString src;
         QTextStream tsstdin(stdin);
+        tsstdin.setEncoding(QStringConverter::System);
         while (!tsstdin.atEnd()) {
             src += tsstdin.readAll();
         }

print.cpp

@@ -4,6 +4,7 @@
 Print &Print::globalInstance()
 {
     static Print global;
+    global.setEncoding(QStringConverter::System);
     global.flush();
     return global;
 }