chore: JS array objects

Author: vinniefalco

include/mrdox/Support/JavaScript.hpp

@@ -93,12 +93,51 @@ struct Arg
     void (*push)(Arg const&, Scope&);
 
     int number = 0;
+    unsigned u_number = 0;
     char const* data = nullptr;
     std::size_t size = 0;
     unsigned int index = 0; // of object
 
     Arg() = default;
 
+    Arg(int i) noexcept
+        : push(&push_int)
+        , number(i)
+    {
+    }
+
+    Arg(bool b) noexcept
+        : push(&push_bool)
+        , number(b)
+    {
+    }
+
+    Arg(unsigned u) noexcept
+        : push(&push_uint)
+        , u_number(u)
+    {
+    }
+
+    Arg(std::size_t u) noexcept
+        : push(&push_uint)
+        , u_number(static_cast<std::size_t>(u))
+    {
+    }
+
+    Arg(char const* s) noexcept
+        : push(&push_lstring)
+        , data(s)
+        , size(std::string_view(s).size())
+    {
+    }
+
+    Arg(std::string const& s) noexcept
+        : push(&push_lstring)
+        , data(s.data())
+        , size(s.size())
+    {
+    }
+
     Arg(std::string_view s) noexcept
         : push(&push_lstring)
         , data(s.data())
@@ -108,8 +147,11 @@ struct Arg
 
     MRDOX_DECL Arg(Value const& value) noexcept;
 
-    MRDOX_DECL static void push_Value(Arg const&, Scope&);
+    MRDOX_DECL static void push_bool(Arg const&, Scope&);
+    MRDOX_DECL static void push_int(Arg const&, Scope&);
+    MRDOX_DECL static void push_uint(Arg const&, Scope&);
     MRDOX_DECL static void push_lstring(Arg const&, Scope&);
+    MRDOX_DECL static void push_Value(Arg const&, Scope&);
 };
 
 //------------------------------------------------
@@ -211,6 +253,8 @@ class Value
         return type() == Type::string;
     }
 
+    MRDOX_DECL bool isArray() const noexcept;
+
     bool isObject() const noexcept
     {
         return type() == Type::object;
@@ -296,6 +340,34 @@ class String : public Value
 
 //------------------------------------------------
 
+/** An ECMAScript Array.
+
+    An Array is an Object which has the internal
+    class Array prototype.
+*/
+class Array : public Value
+{
+    friend struct Access;
+
+    Array(int idx, Scope&) noexcept;
+
+public:
+    MRDOX_DECL Array(Value value);
+    MRDOX_DECL Array& operator=(Value value);
+    MRDOX_DECL explicit Array(Scope& scope);
+
+    MRDOX_DECL
+    std::size_t
+    size() const;
+
+    MRDOX_DECL
+    void
+    push_back(
+        Arg value) const;
+};
+
+//------------------------------------------------
+
 /** An ECMAScript Object.
 */
 class Object : public Value
@@ -314,6 +386,11 @@ class Object : public Value
     MRDOX_DECL Object& operator=(Value value);
     MRDOX_DECL explicit Object(Scope& scope);
 
+    MRDOX_DECL
+    void
+    insert(
+        std::string_view name, Arg value) const;
+
     /** Call a member or function.
     */
     template<class... Args>

source/Support/JavaScript.cpp

@@ -51,9 +51,9 @@ struct Access
         return (*this)(scope.ctx_);
     }
 
-    duk_idx_t operator()(Object const& obj) const noexcept
+    duk_idx_t operator()(Value const& val) const noexcept
     {
-        return obj.idx_;
+        return val.idx_;
     }
 
     void addref(Scope& scope) const noexcept
@@ -150,10 +150,26 @@ Arg(Value const& value) noexcept
 
 void
 Arg::
-push_Value(
+push_bool(
     Arg const& arg, Scope& scope)
 {
-    duk_dup(A(scope), arg.index);
+    duk_push_boolean(A(scope), arg.number != 0);
+}
+
+void
+Arg::
+push_int(
+    Arg const& arg, Scope& scope)
+{
+    duk_push_int(A(scope), arg.number);
+}
+
+void
+Arg::
+push_uint(
+    Arg const& arg, Scope& scope)
+{
+    duk_push_uint(A(scope), arg.u_number);
 }
 
 void
@@ -164,6 +180,14 @@ push_lstring(
     duk_push_lstring(A(scope), arg.data, arg.size);
 }
 
+void
+Arg::
+push_Value(
+    Arg const& arg, Scope& scope)
+{
+    duk_dup(A(scope), arg.index);
+}
+
 //------------------------------------------------
 
 void
@@ -327,6 +351,15 @@ type() const noexcept
     }
 }
 
+bool
+Value::
+isArray() const noexcept
+{
+    return
+        isObject() &&
+        duk_is_array(A(*scope_), idx_);
+}
+
 Expected<Value>
 Value::
 callImpl(
@@ -388,6 +421,66 @@ get() const noexcept
     return { data, size };
 }
 
+//------------------------------------------------
+//
+// Array
+//
+//------------------------------------------------
+
+Array::
+Array(
+    int idx,
+    Scope& scope) noexcept
+    : Value(idx, scope)
+{
+}
+
+Array::
+Array(
+    Value value)
+{
+    if(! value.isArray())
+        throw Error("not an Array");
+    static_cast<Value&>(*this) = std::move(value);
+}
+
+Array&
+Array::
+operator=(
+    Value value)
+{
+    if(! value.isArray())
+        throw Error("not an Array");
+    static_cast<Value&>(*this) = std::move(value);
+    return *this;
+}
+
+Array::
+Array(Scope& scope)
+    : Value(duk_push_array(A(scope)), scope)
+{
+}
+
+std::size_t
+Array::
+size() const
+{
+    return duk_get_length(A(*scope_), idx_);
+}
+
+void
+Array::
+push_back(
+    Arg value) const
+{
+    auto len = duk_get_length(A(*scope_), idx_);
+    value.push(value, *scope_);
+    if(! duk_put_prop_index(A(*scope_), idx_, len))
+    {
+        // VFALCO What?
+    }
+}
+
 //------------------------------------------------
 //
 // Object
@@ -430,6 +523,19 @@ Object(Scope& scope)
 {
 }
 
+void
+Object::
+insert(
+    std::string_view name, Arg value) const
+{
+    value.push(value, *scope_);
+    if(! duk_put_prop_lstring(A(*scope_),
+        idx_, name.data(), name.size()))
+    {
+        // VFALCO What?
+    }
+}
+
 //------------------------------------------------
 
 Expected<Value>