common: remove now unused luajs code using the old JSC API

Author: balejk

common/luajs.c

@@ -18,221 +18,6 @@
 
 #include "common/luajs.h"
 
-gchar*
-tostring(JSContextRef context, JSValueRef value, gchar **error)
-{
-    JSStringRef str = JSValueToStringCopy(context, value, NULL);
-    if (!str) {
-        if (error)
-            *error = g_strdup("string conversion failed");
-        return NULL;
-    }
-    size_t size = JSStringGetMaximumUTF8CStringSize(str);
-    gchar *ret = g_malloc(sizeof(gchar)*size);
-    JSStringGetUTF8CString(str, ret, size);
-    JSStringRelease(str);
-    return ret;
-}
-
-gint
-luaJS_pushstring(lua_State *L, JSContextRef context, JSValueRef value, gchar **error)
-{
-    gchar *str = tostring(context, value, error);
-    if (str) {
-        lua_pushstring(L, str);
-        g_free(str);
-        return 1;
-    }
-    return 0;
-}
-
-gint
-luaJS_pushobject(lua_State *L, JSContextRef context, JSObjectRef obj, gchar **error)
-{
-    gint top = lua_gettop(L);
-
-    JSPropertyNameArrayRef keys = JSObjectCopyPropertyNames(context, obj);
-    size_t count = JSPropertyNameArrayGetCount(keys);
-    JSValueRef exception = NULL;
-
-    lua_newtable(L);
-
-    for (size_t i = 0; i < count; i++) {
-        /* push table key onto stack */
-        JSStringRef key = JSPropertyNameArrayGetNameAtIndex(keys, i);
-        size_t slen = JSStringGetMaximumUTF8CStringSize(key);
-        gchar cstr[slen];
-        JSStringGetUTF8CString(key, cstr, slen);
-
-        gchar *eptr = NULL;
-        int n = strtol(cstr, &eptr, 10);
-        if (!*eptr) /* end at '\0' ? == it's a number! */
-            lua_pushinteger(L, ++n); /* 0-index array to 1-index array */
-        else
-            lua_pushstring(L, cstr);
-
-        /* push table value into stack */
-        JSValueRef val = JSObjectGetProperty(context, obj, key, &exception);
-        if (exception) {
-            lua_settop(L, top);
-            if (error) {
-                gchar *err = tostring(context, exception, NULL);
-                *error = g_strdup_printf("JSObjectGetProperty call failed (%s)",
-                        err ? err : "unknown reason");
-                g_free(err);
-            }
-            JSPropertyNameArrayRelease(keys);
-            return 0;
-        }
-        luaJS_pushvalue(L, context, val, error);
-        if (error && *error) {
-            lua_settop(L, top);
-            JSPropertyNameArrayRelease(keys);
-            return 0;
-        }
-        lua_rawset(L, -3);
-    }
-    JSPropertyNameArrayRelease(keys);
-    return 1;
-}
-
-/* Push JavaScript value onto Lua stack */
-gint
-luaJS_pushvalue(lua_State *L, JSContextRef context, JSValueRef value, gchar **error)
-{
-    switch (JSValueGetType(context, value)) {
-      case kJSTypeBoolean:
-        lua_pushboolean(L, JSValueToBoolean(context, value));
-        return 1;
-
-      case kJSTypeNumber:
-        lua_pushnumber(L, JSValueToNumber(context, value, NULL));
-        return 1;
-
-      case kJSTypeString:
-        return luaJS_pushstring(L, context, value, error);
-
-      case kJSTypeObject:
-        return luaJS_pushobject(L, context, (JSObjectRef)value, error);
-
-      case kJSTypeUndefined:
-      case kJSTypeNull:
-        lua_pushnil(L);
-        return 1;
-
-      default:
-        break;
-    }
-    if (error)
-        *error = g_strdup("Unable to convert value into equivalent Lua type");
-    return 0;
-}
-
-JSValueRef
-luaJS_fromtable(lua_State *L, JSContextRef context, gint idx, gchar **error)
-{
-    gint top = lua_gettop(L);
-
-    /* convert relative index into abs */
-    if (idx < 0)
-        idx = top + idx + 1;
-
-    JSValueRef exception = NULL;
-    JSObjectRef obj;
-
-    size_t len = lua_objlen(L, idx);
-    if (len) {
-        obj = JSObjectMakeArray(context, 0, NULL, &exception);
-        if (exception) {
-            if (error) {
-                gchar *err = tostring(context, exception, NULL);
-                *error = g_strdup_printf("JSObjectMakeArray call failed (%s)",
-                        err ? err : "unknown reason");
-                g_free(err);
-            }
-            return NULL;
-        }
-
-        lua_pushnil(L);
-        for (guint i = 0; lua_next(L, idx); i++) {
-            JSValueRef val = luaJS_tovalue(L, context, -1, error);
-            if (error && *error) {
-                lua_settop(L, top);
-                return NULL;
-            }
-            lua_pop(L, 1);
-            JSObjectSetPropertyAtIndex(context, obj, i, val, &exception);
-        }
-    } else {
-        obj = JSObjectMake(context, NULL, NULL);
-        lua_pushnil(L);
-        while (lua_next(L, idx)) {
-            /* We only care about string attributes in the table */
-            if (lua_type(L, -2) == LUA_TSTRING) {
-                JSValueRef val = luaJS_tovalue(L, context, -1, error);
-                if (error && *error) {
-                    lua_settop(L, top);
-                    return NULL;
-                }
-                JSStringRef key = JSStringCreateWithUTF8CString(lua_tostring(L, -2));
-                JSObjectSetProperty(context, obj, key, val,
-                        kJSPropertyAttributeNone, &exception);
-                JSStringRelease(key);
-                if (exception) {
-                    if (error) {
-                        gchar *err = tostring(context, exception, NULL);
-                        *error = g_strdup_printf("JSObjectSetProperty call failed (%s)",
-                                err ? err : "unknown reason");
-                        g_free(err);
-                    }
-                    return NULL;
-                }
-            }
-            lua_pop(L, 1);
-        }
-    }
-    return obj;
-}
-
-/* Make JavaScript value from Lua value */
-JSValueRef
-luaJS_tovalue(lua_State *L, JSContextRef context, gint idx, gchar **error)
-{
-    JSStringRef str;
-    JSValueRef ret;
-
-    switch (lua_type(L, idx)) {
-      case LUA_TBOOLEAN:
-        return JSValueMakeBoolean(context, lua_toboolean(L, idx));
-
-      case LUA_TNUMBER:
-        return JSValueMakeNumber(context, lua_tonumber(L, idx));
-
-      case LUA_TNIL:
-        return JSValueMakeNull(context);
-
-      case LUA_TNONE:
-        return JSValueMakeUndefined(context);
-
-      case LUA_TSTRING:
-        str = JSStringCreateWithUTF8CString(lua_tostring(L, idx));
-        ret = JSValueMakeString(context, str);
-        JSStringRelease(str);
-        return ret;
-
-      case LUA_TTABLE:
-        return luaJS_fromtable(L, context, idx, error);
-
-      default:
-        break;
-    }
-
-    if (error)
-        *error = g_strdup_printf("unhandled Lua->JS type conversion (type %s)",
-                lua_typename(L, lua_type(L, idx)));
-    return JSValueMakeUndefined(context);
-}
-
 /*
  * Converts Lua value referenced by idx to the corresponding JavaScript type.
  * Returns NULL on failure.
@@ -296,16 +81,6 @@ JSCValue *luajs_tovalue(lua_State *L, int idx, JSCContext *ctx)
     return NULL;
 }
 
-/* create JavaScript exception object from string */
-JSValueRef
-luaJS_make_exception(JSContextRef context, const gchar *error)
-{
-    JSStringRef estr = JSStringCreateWithUTF8CString(error);
-    JSValueRef exception = JSValueMakeString(context, estr);
-    JSStringRelease(estr);
-    return JSValueToObject(context, exception, NULL);
-}
-
 /*
  * Converts JS value to the corresponding Lua type and pushes the result onto
  * the Lua stack. Returns the number of pushed values, 0 thus signals error.

common/luajs.h

@@ -19,20 +19,11 @@
 #ifndef LUAKIT_COMMON_LUAJS_H
 #define LUAKIT_COMMON_LUAJS_H
 
-#include <JavaScriptCore/JavaScript.h>
 #include <jsc/jsc.h>
-#include <stdlib.h>
+#include <stdbool.h>
 #include <glib.h>
 #include <lua.h>
 
-gchar* tostring(JSContextRef context, JSValueRef value, gchar **error);
-gint luaJS_pushstring(lua_State *L, JSContextRef context, JSValueRef value, gchar **error);
-gint luaJS_pushobject(lua_State *L, JSContextRef context, JSObjectRef obj, gchar **error);
-gint luaJS_pushvalue(lua_State *L, JSContextRef context, JSValueRef value, gchar **error);
-JSValueRef luaJS_fromtable(lua_State *L, JSContextRef context, gint idx, gchar **error);
-JSValueRef luaJS_tovalue(lua_State *L, JSContextRef context, gint idx, gchar **error);
-JSValueRef luaJS_make_exception(JSContextRef context, const gchar *error);
-
 int luajs_eval_js(lua_State *L, JSCContext *ctx, const char *code, const char *source, guint line, bool no_return);
 int luajs_pushvalue(lua_State *L, JSCValue *value);
 JSCValue *luajs_tovalue(lua_State *L, int idx, JSCContext *ctx);