feat: add defer

Author: zeromake

.vscode/launch.json

@@ -1,9 +1,21 @@
 {
-    // 使用 IntelliSense 了解相关属性。 
+    // 使用 IntelliSense 了解相关属性。
     // 悬停以查看现有属性的描述。
     // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        {
+            "name": "onscripter 启动",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/build/macosx/x86_64/debug/onscripter",
+            "args": ["/Users/zero/Documents/ons/初音岛2"],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+            "externalConsole": false,
+            "MIMode": "lldb"
+        },
         {
             "name": "(lldb) 启动",
             "type": "cppdbg",

README.md

@@ -172,3 +172,4 @@ adb install ./app/build/outputs/apk/debug/app-debug.apk
 - [gb2312码表](https://uic.io/zh/charset/show/gb2312/)
 - [gb18030码表](https://uic.io/zh/charset/show/gb18030/)
 - [SDL2_Tutorials](https://lazyfoo.net/tutorials/SDL/index.php)
+- [C++开源库列表](https://www.cnblogs.com/chendeqiang/p/12861712.html)

include/infra/Config.hpp

@@ -81,6 +81,27 @@ template <typename T, typename... Args>
 inline UniquePtr<T> MakeUnique(Args&&... args) {
     return std::make_unique<T, Args...>(std::forward<Args>(args)...);
 }
+
+#define var_defer__(x) defer__ ## x
+#define var_defer_(x) var_defer__(x)
+#define defer(ops) onscripter::Defer var_defer_(__COUNTER__)(ops)
+#define ref_defer(ops) onscripter::Defer var_defer_(__COUNTER__)([&]{ ops; }) // Capture all by ref
+#define val_defer(ops) onscripter::Defer var_defer_(__COUNTER__)([=]{ ops; }) // Capture all by val
+#define none_defer(ops) onscripter::Defer var_defer_(__COUNTER__)([]{ ops; }) // Capture nothing
+
+struct Defer {
+    std::function<void(void)> action;
+    Defer(const std::function<void(void)>& act): action(act) {};
+    Defer(const std::function<void(void)>&& act): action(std::move(act)) {};
+    Defer(const Defer& act) = delete;
+    Defer& operator=(const Defer& act) = delete;
+    Defer(Defer&& act) = delete;
+    Defer& operator=(Defer&& act) = delete;
+    ~Defer() {
+        action();
+    };
+};
+
 };  // namespace onscripter
 
 #endif

src/ScriptHandler.cpp

@@ -689,9 +689,8 @@ void ScriptHandler::saveKidokuData() {
         utils::printError("can't write kidoku.dat\n");
         return;
     }
-
+    defer([&fp]{fclose(fp);});
     fwrite(kidoku_buffer, 1, script_buffer_length / 8, fp);
-    fclose(fp);
 }
 
 void ScriptHandler::loadKidokuData() {
@@ -702,8 +701,8 @@ void ScriptHandler::loadKidokuData() {
     memset(kidoku_buffer, 0, script_buffer_length / 8 + 1);
 
     if ((fp = fopen("kidoku.dat", "rb", true)) != NULL) {
+        defer([&fp]{fclose(fp);});
         fread(kidoku_buffer, 1, script_buffer_length / 8, fp);
-        fclose(fp);
     }
 }
 

src/ScriptParser.cpp

@@ -519,6 +519,7 @@ int ScriptParser::saveFileIOBuf(const char *filename,
 
     FILE *fp;
     if ((fp = fopen(filename, "wb", use_save_dir)) == NULL) return -1;
+    defer([&fp]{fclose(fp);});
 
     size_t ret = fwrite(file_io_buf + offset, 1, file_io_buf_ptr - offset, fp);
 
@@ -529,8 +530,6 @@ int ScriptParser::saveFileIOBuf(const char *filename,
         fputc('*', fp);
     }
 
-    fclose(fp);
-
     if (ret != file_io_buf_ptr - offset) return -2;
 
     return 0;
@@ -542,6 +541,7 @@ size_t ScriptParser::loadFileIOBuf(const char *filename) {
 
     FILE *fp;
     if ((fp = fopen(filename, "rb", use_save_dir)) == NULL) return 0;
+    defer([&fp]{fclose(fp);});
 
     fseek(fp, 0, SEEK_END);
     size_t len = ftell(fp);
@@ -550,7 +550,6 @@ size_t ScriptParser::loadFileIOBuf(const char *filename) {
 
     fseek(fp, 0, SEEK_SET);
     size_t ret = fread(file_io_buf, 1, len, fp);
-    fclose(fp);
 
     return ret;
 }
@@ -840,6 +839,7 @@ void ScriptParser::createKeyTable(const char *key_exe) {
         utils::printError("createKeyTable: can't open EXE file %s\n", key_exe);
         return;
     }
+    defer([&fp]{fclose(fp);});
 
     key_table = new unsigned char[256];
 
@@ -862,7 +862,6 @@ void ScriptParser::createKeyTable(const char *key_exe) {
         ring_buffer[ring_last] = ch;
         ring_last = (ring_last + 1) % 256;
     }
-    fclose(fp);
 
     if (ch == EOF) errorAndExit("createKeyTable: can't find a key table.");
 

src/entry/onscripter_main.cpp

@@ -457,6 +457,7 @@ ONSCRIPTER_MAIN_EXTREN int main(int argc, char *argv[]) {
     } else
         fp = fopen(argfilename, "r");
     if (fp) {
+        defer([&fp]{fclose(fp);});
         char **args = new char *[16];
         int argn = 0;
         args[argn] = new char[64]{0};

src/onscripter/ONScripter_command.cpp

@@ -2336,6 +2336,7 @@ int ONScripter::getregCommand() {
         utils::printError("Cannot open file [%s]\n", registry_file);
         return RET_CONTINUE;
     }
+    defer([&fp]{fclose(fp);});
 
     char reg_buf[256], reg_buf2[256];
     bool found_flag = false;
@@ -2376,7 +2377,6 @@ int ONScripter::getregCommand() {
     }
 
     if (!found_flag) utils::printError("  The key is not found.\n");
-    fclose(fp);
 
     return RET_CONTINUE;
 }
@@ -2676,6 +2676,7 @@ int ONScripter::exec_dllCommand() {
             "Cannot open file [%s] while reading %s\n", dll_file, dll_name);
         return RET_CONTINUE;
     }
+    defer([&fp]{fclose(fp);});
 
     char dll_buf[256], dll_buf2[256];
     bool found_flag = false;
@@ -2720,7 +2721,6 @@ int ONScripter::exec_dllCommand() {
 
     if (!found_flag)
         utils::printError("  The DLL is not found in %s.\n", dll_file);
-    fclose(fp);
 
     return RET_CONTINUE;
 }

src/onscripter/ONScripter_sound.cpp

@@ -149,8 +149,8 @@ int ONScripter::playSound(const char *filename,
             utils::printError("can't open temporaly MIDI file %s\n",
                               TMP_MUSIC_FILE);
         } else {
+            defer([&fp]{fclose(fp);});
             fwrite(buffer, 1, length, fp);
-            fclose(fp);
             ext_music_play_once_flag = !loop_flag;
             if (playMIDI(loop_flag) == 0) {
                 delete[] buffer;

src/reader/DirectReader.cpp

@@ -401,6 +401,7 @@ size_t DirectReader::getFile(const char *file_name,
     FILE *fp = getFileHandle(file_name, compression_type, &len);
 
     if (fp) {
+        defer([&fp]{fclose(fp);});
         if (compression_type & NBZ_COMPRESSION)
             return decodeNBZ(fp, 0, buffer);
         else if (compression_type & SPB_COMPRESSION)
@@ -417,7 +418,6 @@ size_t DirectReader::getFile(const char *file_name,
             fread(buffer, 1, c, fp);
             buffer += c;
         }
-        fclose(fp);
         if (location) *location = ARCHIVE_TYPE_NONE;
     }