From 7f12f1cce575d4236f36999e0b621c1cd1d14bf2 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Tue, 25 Oct 2016 21:09:30 -0700
Subject: [PATCH] ircd::js: Disambiguate and improve value/object conversions.

---
 include/ircd/js/object.h | 13 -------------
 include/ircd/js/value.h  | 25 +++++++++++++++++--------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/include/ircd/js/object.h b/include/ircd/js/object.h
index daff7e1dd..5808398f1 100644
--- a/include/ircd/js/object.h
+++ b/include/ircd/js/object.h
@@ -42,7 +42,6 @@ struct object
 	object(const object::handle_mutable &h): object{h.get()} {}
 	object(const object::handle &h): object{h.get()} {}
 	explicit object(const value &);
-	object(JSFunction *const &);
 	object(JSObject *const &);
 	object(JSObject &);
 	object();
@@ -100,18 +99,6 @@ object::object(const value &val)
 		throw type_error("Value is not an Object");
 }
 
-inline
-object::object(JSFunction *const &val)
-:JS::Rooted<JSObject *>
-{
-	*cx,
-	val? JS_GetFunctionObject(val) : nullptr
-}
-{
-	if(unlikely(!get()))
-		throw type_error("Function cannot convert to Object");
-}
-
 inline
 object::object(const JSClass *const &clasp)
 :JS::Rooted<JSObject *>
diff --git a/include/ircd/js/value.h b/include/ircd/js/value.h
index c76771202..48ac830a7 100644
--- a/include/ircd/js/value.h
+++ b/include/ircd/js/value.h
@@ -37,8 +37,6 @@ struct value
 	using handle = JS::HandleValue;
 	using handle_mutable = JS::MutableHandleValue;
 
-	explicit operator JSType() const;
-
 	explicit operator std::string() const;
 	explicit operator double() const;
 	explicit operator uint64_t() const;
@@ -48,8 +46,8 @@ struct value
 	explicit operator uint16_t() const;
 	explicit operator bool() const;
 
-	value(const char *const &);
 	explicit value(const std::string &);
+	value(const char *const &);
 	value(const nullptr_t &);
 	value(const double &);
 	value(const float &);
@@ -58,6 +56,7 @@ struct value
 
 	value(const jsid &);
 	value(JSObject &);
+	value(JSObject *const &);
 	value(JSString *const &);
 	value(JSFunction *const &);
 	value(JS::Symbol *const &);
@@ -73,6 +72,7 @@ struct value
 	value(const value &) = delete;
 	value &operator=(value &&) noexcept;
 
+	friend JSType type(const value &);
 	friend bool undefined(const value &);
 };
 
@@ -135,6 +135,16 @@ value::value(JS::Symbol *const &val)
 {
 }
 
+inline
+value::value(JSObject *const &val)
+:JS::Rooted<JS::Value>
+{
+	*cx,
+	val? JS::ObjectValue(*val) : throw internal_error("NULL JSObject")
+}
+{
+}
+
 inline
 value::value(JSObject &val)
 :JS::Rooted<JS::Value>{*cx, JS::ObjectValue(val)}
@@ -297,17 +307,16 @@ const
 	return s? native(s) : throw type_error("Failed to cast to string");
 }
 
-inline
-value::operator JSType()
-const
+inline JSType
+type(const value &val)
 {
-	return JS_TypeOfValue(*cx, *this);
+	return JS_TypeOfValue(*cx, val);
 }
 
 inline bool
 undefined(const value &val)
 {
-	return JSType(val) == JSTYPE_VOID;
+	return type(val) == JSTYPE_VOID;
 }
 
 } // namespace js