perf: ✨ use c++ inline to simpify code and improve speed

- ADD FuncStatus & funcStatusTable
asdawej · Dec 4, 2023 · 0e21da9 · 0e21da9
1 parent 02a939e
commit 0e21da9
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 32 deletions.
diff --git a/include/AssistFunc.h b/include/AssistFunc.h
@@ -14,11 +14,11 @@ constexpr int pow2(int x) {
 }
 
 // 左值二进制写入
-void binaryIn(std::ostream &ostr, auto &data) { ostr.write((char *)&data, sizeof(data)); }
+inline void binaryIn(std::ostream &ostr, auto &data) { ostr.write((char *)&data, sizeof(data)); }
 // 右值二进制写入
-void binaryIn(std::ostream &ostr, auto &&data) { ostr.write((char *)&data, sizeof(data)); }
+inline void binaryIn(std::ostream &ostr, auto &&data) { ostr.write((char *)&data, sizeof(data)); }
 // 二进制读出
-template <typename _T> _T binaryOut(std::istream &istr) {
+template <typename _T> inline _T binaryOut(std::istream &istr) {
     _T data;
     istr.read((char *)&data, sizeof(data));
     return data;

diff --git a/include/Function.h b/include/Function.h
@@ -49,7 +49,7 @@ struct ThreadNode : public FunctionNode {
     FunctionNode *thread; // 子线程代码树
 
     Type_FunctionNode type() override;
-    void operator()() override; // # 暂时无法实现
+    void operator()() override;
     void serialize(std::ostream &) override;
     void deserialize(std::istream &) override;
 };
@@ -61,7 +61,7 @@ struct AtomNode : public FunctionNode {
     FunctionNode *atom; // 原子操作代码树
 
     Type_FunctionNode type() override;
-    void operator()() override; // # 暂时无法实现
+    void operator()() override;
     void serialize(std::ostream &) override;
     void deserialize(std::istream &) override;
 };
@@ -106,7 +106,7 @@ struct DefineNode : public FunctionNode {
 // `6`结点, 条件转移
 struct ConditionNode : public FunctionNode {
     ConditionNode() : cond(0), func_T(nullptr), func_F(nullptr){};
-    ~ConditionNode() { delete func_T, func_F; };
+    ~ConditionNode() { delete func_T, delete func_F; };
     tff::TryteExpr cond;           // 条件
     FunctionNode *func_T, *func_F; // 正值代码树func_T，负值代码树func_F
 
@@ -118,7 +118,7 @@ struct ConditionNode : public FunctionNode {
 
 // `7`结点, 导通两个流
 struct StreamIONode : public FunctionNode {
-    StreamIONode() : str_I(nullptr), str_O(nullptr), size(0){};
+    StreamIONode() : str_O(nullptr), str_I(nullptr), size(0){};
     ~StreamIONode();
     Stream::Ostream *str_O; // 输出流
     Stream::Istream *str_I; // 输入流

diff --git a/include/tff.h b/include/tff.h
@@ -10,11 +10,18 @@ namespace tff {
 
 constexpr int stackLength = 2 * BTS::maxValue + 1;
 
-using FuncTree = Function::FunctionNode *;
+using FuncTree = Function::FunctionNode *; // 代码树
+
 // 内存栈
-extern BTS::Tryte *stack;
+inline BTS::Tryte *stack = &(BTS::Tryte[stackLength]){}[BTS::maxValue];
+
 // 代码树表
-extern FuncTree *funcTable;
+inline FuncTree *funcTable = &(FuncTree[stackLength]){}[BTS::maxValue];
+
+enum struct FuncStatus { normal, fork, lock };
+
+// 代码树线程状态
+inline FuncStatus *funcStatusTable = &(FuncStatus[stackLength]){}[BTS::maxValue];
 
 }; // namespace tff
 

diff --git a/src/base/Function.cpp b/src/base/Function.cpp
@@ -3,6 +3,14 @@
 #include "std/Register.h"
 #include "tff.h"
 
+#ifdef __MINGW32__ // https://github.com/meganz/mingw-std-threads
+#include <mingw.mutex.h>
+#include <mingw.thread.h>
+#else
+#include <mutex>
+#include <thread>
+#endif
+
 namespace Function {
 
 FunctionNode *factory_FunctionNode(Type_FunctionNode &&_tp) {
@@ -43,6 +51,7 @@ FunctionNode *factory_FunctionNode(Type_FunctionNode &&_tp) {
     default:
         break;
     }
+    return nullptr;
 }
 
 FunctionNode::NodePair FunctionNode::findEndNode(FunctionNode *start) {

diff --git a/src/base/Stream.cpp b/src/base/Stream.cpp
@@ -4,7 +4,7 @@
 namespace Stream {
 
 // 辅助函数, 取表达式值
-BTS::Tryte _getValue(tff::TryteExpr expr) {
+inline BTS::Tryte _getValue(tff::TryteExpr expr) {
     auto count = expr.suffix;
     auto ret = expr.value;
     while (count > 0) {

diff --git a/src/base/TryteExpr.cpp b/src/base/TryteExpr.cpp
@@ -33,7 +33,7 @@ char *TryteExpr::repr() {
     char *s_value = value.repr();
     std::copy(s_value, s_value + BTS::tryteTritNum, ret);
     delete[] s_value;
-    for (auto i = BTS::tryteTritNum; i < BTS::tryteTritNum + suffix; i++)
+    for (size_t i = BTS::tryteTritNum; i < BTS::tryteTritNum + suffix; i++)
         ret[i] = '2';
     ret[BTS::tryteTritNum + suffix] = '\0';
     return ret;

diff --git a/src/base/tff.cpp b/src/base/tff.cpp
diff --git a/src/compiler.cpp b/src/compiler.cpp
@@ -10,7 +10,7 @@ using StdFunc = Function::StdFunctionNode::Func;
 auto factory = Function::factory_FunctionNode;
 
 // 标准对象转义处理
-void *token2ObjectStd(TokenPtr &tkCur, TokenPtr &vecEnd) {
+inline void *token2ObjectStd(TokenPtr &tkCur, TokenPtr &vecEnd) {
     if (*tkCur == "(")
         tkCur++;
     auto ret = Register::dict_ID2ObjectStd[Register::dict_Token2ID[*tkCur]];
@@ -19,7 +19,7 @@ void *token2ObjectStd(TokenPtr &tkCur, TokenPtr &vecEnd) {
 }
 
 // 小括号内部提取
-string tokenInBracket(TokenPtr &tkCur, TokenPtr &vecEnd) {
+inline string tokenInBracket(TokenPtr &tkCur, TokenPtr &vecEnd) {
     if (*tkCur == "(")
         tkCur++;
     auto ret = *tkCur;
@@ -28,7 +28,7 @@ string tokenInBracket(TokenPtr &tkCur, TokenPtr &vecEnd) {
 }
 
 // 前置大括号处理
-void startCreateNode(TokenPtr &treeStart, size_t &count, TokenPtr &vecEnd) {
+inline void startCreateNode(TokenPtr &treeStart, size_t &count, TokenPtr &vecEnd) {
     while (treeStart < vecEnd) {
         if (*treeStart == "{") {
             count++;
@@ -40,7 +40,7 @@ void startCreateNode(TokenPtr &treeStart, size_t &count, TokenPtr &vecEnd) {
 }
 
 // 后置大括号处理
-void endCreateNode(TokenPtr &treeStart, size_t &count, TokenPtr &vecEnd) {
+inline void endCreateNode(TokenPtr &treeStart, size_t &count, TokenPtr &vecEnd) {
     while (treeStart < vecEnd) {
         if (*treeStart == "}") {
             count--;

diff --git a/src/interpreter.cpp b/src/interpreter.cpp
@@ -11,5 +11,4 @@ void interpreter(const char *tffb_file) {
     root->deserialize(compiled_code);
     compiled_code.close();
     (*root)();
-    system("pause");
 }
diff --git a/src/main.cpp b/src/main.cpp
@@ -30,7 +30,7 @@ int main(int argc, const char *argv[]) {
                 strcpy(tffb_file, argv[3]);
             }
             compiler(analyzer(tffl_file), tffb_file);
-            delete tffl_file, tffb_file;
+            delete tffl_file, delete tffb_file;
         } else if (!strcasecmp("-r", argv[1])) {
             auto len = strlen(argv[2]);
             tffb_file = new char[len + 1];
@@ -54,7 +54,7 @@ int main(int argc, const char *argv[]) {
             }
             compiler(analyzer(tffl_file), tffb_file);
             interpreter(tffb_file);
-            delete tffl_file, tffb_file;
+            delete tffl_file, delete tffb_file;
         } else
             goto L_ARGWRONG;
     } else

diff --git a/src/std/StdFunction.cpp b/src/std/StdFunction.cpp
@@ -2,8 +2,8 @@
 #include "tff.h"
 #include <chrono>
 
-#ifdef __MINGW32__
-#include <mingw.thread.h> // https://github.com/meganz/mingw-std-threads
+#ifdef __MINGW32__ // https://github.com/meganz/mingw-std-threads
+#include <mingw.thread.h>
 #else
 #include <thread>
 #endif