opt(util): 为Variables添加get()模板函数，方便使用

Author: hevake

modules/flow/to_graphviz_test.cpp

@@ -41,7 +41,10 @@ TEST(ToGraphviz, ActionJson) {
 
     auto seq_action = new SequenceAction(*loop);
     seq_action->set_label("This is test");
+    seq_action->vars().define("seq.value", 12);
     auto if_else_action = new IfElseAction(*loop);
+    if_else_action->vars().define("if_else.name", "hello");
+    if_else_action->vars().define("if_else.value", 100);
     if_else_action->setChildAs(new SuccAction(*loop), "if");
     if_else_action->setChildAs(new FunctionAction(*loop, []{return true;}), "succ");
     if_else_action->setChildAs(new FunctionAction(*loop, []{return true;}), "fail");

modules/util/variables.h

@@ -23,6 +23,7 @@
 #include <map>
 #include <tbox/base/defines.h>
 #include <tbox/base/json_fwd.h>
+#include <tbox/util/json.h>
 
 namespace tbox {
 namespace util {
@@ -78,6 +79,15 @@ class Variables {
      */
     bool get(const std::string &name, Json &js_out_value, bool local_only = false) const;
 
+    //! 获取变量的模板
+    template <typename T>
+    bool get(const std::string &name, T &out_value, bool local_only = false) const {
+        Json js;
+        if (get(name, js, local_only))
+            return json::Get(js, out_value);
+        return false;
+    }
+
     /**
      * 更新变量
      *

modules/util/variables_test.cpp

@@ -42,6 +42,31 @@ TEST(Variables, Base) {
     EXPECT_FALSE(vars.has("a"));
 }
 
+TEST(Variables, GetTemplate) {
+    Variables vars;
+
+    EXPECT_TRUE(vars.define("b", true));
+    EXPECT_TRUE(vars.define("i", 12));
+    EXPECT_TRUE(vars.define("s", "hello"));
+    EXPECT_TRUE(vars.define("d", 12.345));
+
+    bool b = false;
+    int  i = 0;
+    std::string s;
+    double d = 0;
+
+    EXPECT_TRUE(vars.get("b", b));
+    EXPECT_TRUE(vars.get("i", i));
+    EXPECT_TRUE(vars.get("s", s));
+    EXPECT_TRUE(vars.get("d", d));
+    EXPECT_FALSE(vars.get("s", d));
+
+    EXPECT_TRUE(b);
+    EXPECT_EQ(i, 12);
+    EXPECT_EQ(s, "hello");
+    EXPECT_DOUBLE_EQ(d, 12.345);
+}
+
 TEST(Variables, RepeatDefine) {
     Variables vars;
     EXPECT_TRUE(vars.define("a", 12));

version.mk

@@ -21,4 +21,4 @@
 # TBOX版本号
 TBOX_VERSION_MAJOR := 1
 TBOX_VERSION_MINOR := 11
-TBOX_VERSION_REVISION := 7
+TBOX_VERSION_REVISION := 8