core, refactor: add intVal and longVal to Variant.

fibjs · Oct 26, 2019 · 65e7d39 · 65e7d39
1 parent 203fe0d
commit 65e7d39
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 9 deletions.
diff --git a/fibjs/include/Redis.h b/fibjs/include/Redis.h
@@ -260,7 +260,19 @@ class Redis : public Redis_base {
 
     static result_t retValue(Variant& v, bool& retVal)
     {
-        retVal = !!(int32_t)v;
+        retVal = !!v.intVal();
+        return 0;
+    }
+
+    static result_t retValue(Variant& v, int32_t& retVal)
+    {
+        retVal = v.intVal();
+        return 0;
+    }
+
+    static result_t retValue(Variant& v, int64_t& retVal)
+    {
+        retVal = v.longVal();
         return 0;
     }
 

diff --git a/fibjs/include/Variant.h b/fibjs/include/Variant.h
@@ -367,11 +367,26 @@ class Variant {
 
     operator v8::Local<v8::Value>() const;
 
-    operator int32_t() const
+    int32_t intVal() const
     {
-        if (type() != VT_Integer)
-            return 0;
-        return m_Val.intVal;
+        if (type() == VT_Integer)
+            return m_Val.intVal;
+        if (type() == VT_Long)
+            return m_Val.longVal;
+        if (type() == VT_Number)
+            return m_Val.dblVal;
+        return 0;
+    }
+
+    int64_t longVal() const
+    {
+        if (type() == VT_Integer)
+            return m_Val.intVal;
+        if (type() == VT_Long)
+            return m_Val.longVal;
+        if (type() == VT_Number)
+            return m_Val.dblVal;
+        return 0;
     }
 
     bool boolVal() const
@@ -383,9 +398,13 @@ class Variant {
 
     double dblVal() const
     {
-        if (type() != VT_Number)
-            return 0;
-        return m_Val.dblVal;
+        if (type() == VT_Integer)
+            return m_Val.intVal;
+        if (type() == VT_Long)
+            return m_Val.longVal;
+        if (type() == VT_Number)
+            return m_Val.dblVal;
+        return 0;
     }
 
     void parseNumber(const char* str, int32_t len = -1);

diff --git a/fibjs/src/net/DgramSocket.cpp b/fibjs/src/net/DgramSocket.cpp
@@ -258,7 +258,7 @@ result_t DgramSocket::bind(v8::Local<v8::Object> opts, AsyncEvent* ac)
         ac->m_ctx[1] = addr;
     }
 
-    int32_t port = (int32_t)ac->m_ctx[0];
+    int32_t port = ac->m_ctx[0].intVal();
     exlib::string addr = ac->m_ctx[1].string();
 
     return bind(port, addr, ac);