#include "sig/parse.hpp"
#include "sig/ffi_type.hpp"
+#include "Bridge.hpp"
#include "Code.hpp"
#include "Decode.hpp"
#include "Error.hpp"
return pool.strndup(utf8.data, utf8.size);
}
+CYUTF8String CYPoolUTF8String(CYPool &pool, CYUTF8String utf8) {
+ return {pool.strndup(utf8.data, utf8.size), utf8.size};
+}
+
+_visible CYUTF8String CYPoolUTF8String(CYPool &pool, const std::string &value) {
+ return {pool.strndup(value.data(), value.size()), value.size()};
+}
+
CYUTF8String CYPoolUTF8String(CYPool &pool, JSContextRef context, JSStringRef value) {
return CYPoolUTF8String(pool, CYCastUTF16String(value));
}
JSObjectRef CYObjectMakeArray(JSContextRef context, size_t length, const JSValueRef values[]) {
if (JSObjectMakeArray$ != NULL)
return _jsccall(*JSObjectMakeArray$, context, length, values);
- else {
- JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array")));
- JSValueRef value(CYCallAsFunction(context, Array, NULL, length, values));
- return CYCastJSObject(context, value);
- }
+ JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array")));
+ bool wat(length == 1 && JSValueGetType(context, values[0]) == kJSTypeNumber);
+ JSValueRef value(CYCallAsFunction(context, Array, NULL, wat ? 0 : length, values));
+ JSObjectRef object(CYCastJSObject(context, value));
+ if (wat) CYArrayPush(context, object, 1, values);
+ return object;
}
static JSClassRef All_;
-JSClassRef Functor_;
+JSClassRef cy::Functor::Class_;
static JSClassRef Global_;
JSStringRef Array_s;
+JSStringRef constructor_s;
JSStringRef cy_s;
JSStringRef cyi_s;
JSStringRef cyt_s;
+JSStringRef cyt__s;
JSStringRef length_s;
JSStringRef message_s;
JSStringRef name_s;
void CYFinalize(JSObjectRef object) {
CYData *internal(reinterpret_cast<CYData *>(JSObjectGetPrivate(object)));
+ if (internal == NULL)
+ return;
_assert(internal->count_ != _not(unsigned));
if (--internal->count_ == 0)
delete internal;
}
struct Context :
- CYPrivate<Context>
+ CYRoot
{
JSGlobalContextRef context_;
};
struct CArray :
- CYValue<CArray, void *>
+ CYRoot
{
+ void *value_;
CYProtect owner_;
Type_privateData *type_;
size_t length_;
CArray(void *value, size_t length, const sig::Type &type, ffi_type *ffi, JSContextRef context, JSObjectRef owner) :
- CYValue(value),
+ value_(value),
owner_(context, owner),
type_(new(*pool_) Type_privateData(type, ffi)),
length_(length)
{
- if (owner == NULL) {
- size_t size(ffi->size * length);
- void *copy(pool_->malloc<void>(size, ffi->alignment));
- memcpy(copy, value_, size);
- value_ = copy;
- }
}
};
struct CString :
- CYValue<CString, char *>
+ CYRoot
{
+ char *value_;
CYProtect owner_;
CString(char *value, JSContextRef context, JSObjectRef owner) :
- CYValue(value),
+ value_(value),
owner_(context, owner)
{
- if (owner == NULL)
- value_ = pool_->strdup(value_);
}
};
struct Pointer :
- CYValue<Pointer, void *>
+ CYRoot
{
+ void *value_;
CYProtect owner_;
Type_privateData *type_;
Pointer(void *value, const sig::Type &type, JSContextRef context, JSObjectRef owner) :
- CYValue(value),
+ value_(value),
owner_(context, owner),
type_(new(*pool_) Type_privateData(type))
{
}
Pointer(void *value, const char *encoding, JSContextRef context, JSObjectRef owner) :
- CYValue(value),
+ value_(value),
owner_(context, owner),
type_(new(*pool_) Type_privateData(encoding))
{
};
struct Struct_privateData :
- CYValue<Struct_privateData, void *>
+ CYRoot
{
+ void *value_;
CYProtect owner_;
Type_privateData *type_;
Struct_privateData(void *value, const sig::Type &type, ffi_type *ffi, JSContextRef context, JSObjectRef owner) :
- CYValue(value),
+ value_(value),
owner_(context, owner),
type_(new(*pool_) Type_privateData(type, ffi))
{
return JSValueMakeNumber(context, static_cast<double>(value)); \
}
+CYCastJSValue_(long double)
CYCastJSValue_(signed short int)
CYCastJSValue_(unsigned short int)
CYCastJSValue_(signed int)
CYCastJSValue_(signed long long int)
CYCastJSValue_(unsigned long long int)
+#ifdef __SIZEOF_INT128__
+CYCastJSValue_(signed __int128)
+CYCastJSValue_(unsigned __int128)
+#endif
+
JSValueRef CYJSUndefined(JSContextRef context) {
return JSValueMakeUndefined(context);
}
return CYJSUndefined(context);
} CYCatch(NULL) }
+static JSValueRef Global_print(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+ FILE *file(stdout);
+ CYPool pool;
+
+ for (size_t i(0); i != count; ++i) {
+ if (i != 0)
+ fputc(' ', file);
+ CYUTF8String string(CYPoolUTF8String(pool, context, CYJSString(context, arguments[i])));
+ fwrite(string.data, string.size, 1, file);
+ }
+
+ fputc('\n', file);
+ fflush(file);
+ return CYJSUndefined(context);
+} CYCatch(NULL) }
+
static void (*JSSynchronousGarbageCollectForDebugging$)(JSContextRef);
_visible void CYGarbageCollect(JSContextRef context) {
case kJSTypeString: {
std::ostringstream str;
CYUTF8String string(CYPoolUTF8String(pool, context, CYJSString(context, value)));
- CYStringify(str, string.data, string.size);
+ CYStringify(str, string.data, string.size, CYStringifyModeCycript);
std::string value(str.str());
return pool.strmemdup(value.c_str(), value.size());
} break;
std::ostringstream str;
+ JSValueRef value(CYGetProperty(context, object, constructor_s));
+ if (JSValueIsObject(context, value)) {
+ JSObjectRef constructor(CYCastJSObject(context, value));
+ JSValueRef theory(CYGetProperty(context, constructor, prototype_s));
+ JSValueRef practice(JSObjectGetPrototype(context, object));
+
+ if (CYIsStrictEqual(context, theory, practice)) {
+ JSValueRef name(CYGetProperty(context, constructor, name_s));
+ if (!JSValueIsUndefined(context, name)) {
+ auto utf8(CYPoolUTF8String(pool, context, CYJSString(context, name)));
+ if (utf8 != "Object")
+ str << "new" << ' ' << utf8;
+ }
+ }
+ }
+
str << '{';
// XXX: this is, sadly, going to leak
if (CYIsKey(string))
str << string.data;
else
- CYStringify(str, string.data, string.size);
+ CYStringify(str, string.data, string.size, CYStringifyModeLegacy);
str << ':';
std::ostringstream str;
CYUTF8String string(CYPoolUTF8String(pool, context, CYJSString(context, _this)));
- CYStringify(str, string.data, string.size);
+ CYStringify(str, string.data, string.size, CYStringifyModeCycript);
std::string value(str.str());
return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size())));
} CYCatch(NULL) }
JSObjectRef CYMakePointer(JSContextRef context, void *pointer, const sig::Type &type, ffi_type *ffi, JSObjectRef owner) {
- return Pointer::Make(context, pointer, type, context, owner);
+ return CYPrivate<Pointer>::Make(context, pointer, type, context, owner);
}
-static JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), bool variadic, const sig::Signature &signature) {
- return JSObjectMake(context, Functor_, new cy::Functor(function, variadic, signature));
+static JSValueRef CYMakeFunctor(JSContextRef context, void (*function)(), bool variadic, const sig::Signature &signature) {
+ if (function == NULL)
+ return CYJSNull(context);
+ return JSObjectMake(context, cy::Functor::Class_, new cy::Functor(function, variadic, signature));
}
+// XXX: remove this, as it is really stupid
static JSObjectRef CYMakeFunctor(JSContextRef context, const char *symbol, const char *encoding) {
void (*function)()(reinterpret_cast<void (*)()>(CYCastSymbol(symbol)));
if (function == NULL)
cy::Functor *internal(new cy::Functor(function, encoding));
++internal->count_;
- return JSObjectMake(context, Functor_, internal);
+ return JSObjectMake(context, cy::Functor::Class_, internal);
}
bool CYGetOffset(CYPool &pool, JSContextRef context, JSStringRef value, ssize_t &index) {
return CYGetOffset(CYPoolCString(pool, context, value), index);
}
+// XXX: this is a horrible back added for CFType
+void *CYCastPointerEx_(JSContextRef context, JSObjectRef value) {
+ JSObjectRef object((JSObjectRef) value);
+ if (JSValueIsObjectOfClass(context, value, CYPrivate<Pointer>::Class_)) {
+ Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
+ return internal->value_;
+ }
+
+ JSValueRef toPointer(CYGetProperty(context, object, toPointer_s));
+ if (CYIsCallable(context, toPointer)) {
+ JSValueRef value(CYCallAsFunction(context, (JSObjectRef) toPointer, object, 0, NULL));
+ _assert(value != NULL);
+ return CYCastPointer_(context, value);
+ }
+
+ return NULL;
+}
+
void *CYCastPointer_(JSContextRef context, JSValueRef value, bool *guess) {
if (value == NULL)
return NULL;
return NULL;
case kJSTypeObject: {
JSObjectRef object((JSObjectRef) value);
- if (JSValueIsObjectOfClass(context, value, Pointer::Class_)) {
+ if (JSValueIsObjectOfClass(context, value, CYPrivate<Pointer>::Class_)) {
Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
return internal->value_;
}
}
}
+static JSValueRef FunctionAdapter_(JSContextRef context, size_t count, JSValueRef values[], JSObjectRef function);
+
namespace sig {
// XXX: this is somehow not quite a template :/
*reinterpret_cast<Type_ *>(data) = CYCastDouble(context, value); \
}
-CYPoolFFI_(char)
-CYPoolFFI_(double)
+CYPoolFFI_(wchar_t)
CYPoolFFI_(float)
+CYPoolFFI_(double)
+CYPoolFFI_(long double)
+
CYPoolFFI_(signed char)
CYPoolFFI_(signed int)
CYPoolFFI_(signed long int)
CYPoolFFI_(signed long long int)
CYPoolFFI_(signed short int)
+
CYPoolFFI_(unsigned char)
CYPoolFFI_(unsigned int)
CYPoolFFI_(unsigned long int)
CYPoolFFI_(unsigned long long int)
CYPoolFFI_(unsigned short int)
+#ifdef __SIZEOF_INT128__
+CYPoolFFI_(signed __int128)
+CYPoolFFI_(unsigned __int128)
+#endif
+
+template <>
+void Primitive<char>::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+ if (JSValueGetType(context, value) != kJSTypeString)
+ *reinterpret_cast<char *>(data) = CYCastDouble(context, value);
+ else {
+ CYJSString script(context, value);
+ auto string(CYCastUTF16String(script));
+ _assert(string.size == 1);
+ _assert((string.data[0] & 0xff) == string.data[0]);
+ *reinterpret_cast<char *>(data) = string.data[0];
+ }
+}
+
void Void::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
- _assert(false);
+ _assert(JSValueIsUndefined(context, value));
}
void Unknown::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
_assert(false);
}
-static void CYArrayCopy(CYPool *pool, JSContextRef context, uint8_t *base, size_t length, const sig::Type &type, ffi_type *ffi, JSValueRef value, JSObjectRef object) {
+static void CYArrayCopy(CYPool *pool, JSContextRef context, uint8_t *base, size_t length, const sig::Type &type, ffi_type *ffi, JSObjectRef object) {
for (size_t index(0); index != length; ++index) {
- JSValueRef rhs;
- if (object == NULL)
- rhs = value;
- else {
- rhs = CYGetProperty(context, object, index);
- if (JSValueIsUndefined(context, rhs))
- throw CYJSError(context, "unable to extract array value");
- }
-
+ JSValueRef rhs(CYGetProperty(context, object, index));
+ if (JSValueIsUndefined(context, rhs))
+ throw CYJSError(context, "unable to extract array value");
type.PoolFFI(pool, context, ffi, base, rhs);
base += ffi->size;
}
*reinterpret_cast<void **>(data) = CYCastPointer<void *>(context, value, &guess);
if (!guess || pool == NULL || !JSValueIsObject(context, value))
return;
+
JSObjectRef object(CYCastJSObject(context, value));
- if (CYHasProperty(context, object, length_s)) {
+
+ if (sig::Function *function = dynamic_cast<sig::Function *>(&type)) {
+ _assert(!function->variadic);
+ auto internal(CYMakeFunctor_(context, object, function->signature, &FunctionAdapter_));
+ // XXX: see notes in Library.cpp about needing to leak
+ *reinterpret_cast<void (**)()>(data) = internal->value_;
+ } else if (CYHasProperty(context, object, length_s)) {
size_t length(CYArrayLength(context, object));
ffi_type *element(type.GetFFI(*pool));
size_t size(element->size * length);
uint8_t *base(pool->malloc<uint8_t>(size, element->alignment));
- CYArrayCopy(pool, context, base, length, type, element, value, object);
+ CYArrayCopy(pool, context, base, length, type, element, object);
*reinterpret_cast<void **>(data) = base;
}
}
if (size == 0)
return;
uint8_t *base(reinterpret_cast<uint8_t *>(data));
- JSObjectRef object(JSValueIsObject(context, value) ? (JSObjectRef) value : NULL);
- CYArrayCopy(pool, context, base, size, type, ffi->elements[0], value, object);
+ CYArrayCopy(pool, context, base, size, type, ffi->elements[0], CYCastJSObject(context, value));
+}
+
+void Enum::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+ return type.PoolFFI(pool, context, ffi, data, value);
}
void Aggregate::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
_assert(!overlap);
+ _assert(signature.count != _not(size_t));
size_t offset(0);
uint8_t *base(reinterpret_cast<uint8_t *>(data));
_assert(false);
}
+// XXX: this code is getting worse, not better :/
+
#define CYFromFFI_(Type_) \
template <> \
+JSValueRef Primitive<Type_>::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { \
+ JSValueRef value(CYCastJSValue(context, *reinterpret_cast<Type_ *>(data))); \
+ JSObjectRef typed(_jsccall(JSObjectCallAsConstructor, context, CYGetCachedObject(context, CYJSString("Number")), 1, &value)); \
+ CYSetProperty(context, typed, cyt__s, CYMakeType(context, *this), kJSPropertyAttributeDontEnum); \
+ return typed; \
+}
+
+#define CYFromFFI_2(Type_) \
+template <> \
JSValueRef Primitive<Type_>::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { \
return CYCastJSValue(context, *reinterpret_cast<Type_ *>(data)); \
}
-CYFromFFI_(bool)
-CYFromFFI_(char)
-CYFromFFI_(double)
+CYFromFFI_(wchar_t)
CYFromFFI_(float)
-CYFromFFI_(signed char)
-CYFromFFI_(signed int)
+CYFromFFI_(double)
+CYFromFFI_(long double)
+
+CYFromFFI_2(signed char)
+CYFromFFI_2(signed int)
CYFromFFI_(signed long int)
CYFromFFI_(signed long long int)
-CYFromFFI_(signed short int)
-CYFromFFI_(unsigned char)
-CYFromFFI_(unsigned int)
+CYFromFFI_2(signed short int)
+
+CYFromFFI_2(unsigned char)
+CYFromFFI_2(unsigned int)
CYFromFFI_(unsigned long int)
CYFromFFI_(unsigned long long int)
-CYFromFFI_(unsigned short int)
+CYFromFFI_2(unsigned short int)
+
+#ifdef __SIZEOF_INT128__
+CYFromFFI_(signed __int128)
+CYFromFFI_(unsigned __int128)
+#endif
+
+template <>
+JSValueRef Primitive<bool>::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+ return CYCastJSValue(context, *reinterpret_cast<bool *>(data));
+}
+
+template <>
+JSValueRef Primitive<char>::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+ uint16_t string(uint8_t(*reinterpret_cast<char *>(data)));
+ JSValueRef value(CYCastJSValue(context, CYJSString(CYUTF16String(&string, 1))));
+ JSObjectRef typed(_jsccall(JSObjectCallAsConstructor, context, CYGetCachedObject(context, CYJSString("String")), 1, &value));
+ CYSetProperty(context, typed, cyt_s, CYMakeType(context, sig::Primitive<char>()), kJSPropertyAttributeDontEnum);
+ CYSetPrototype(context, typed, CYGetCachedValue(context, CYJSString("Character_prototype")));
+ return typed;
+}
JSValueRef Void::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
return CYJSUndefined(context);
JSValueRef String::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
if (char *value = *reinterpret_cast<char **>(data))
- return CString::Make(context, value, context, owner);
+ return CYPrivate<CString>::Make(context, value, context, owner);
return CYJSNull(context);
}
}
JSValueRef Array::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
- return CArray::Make(context, data, size, type, ffi->elements[0], context, owner);
+ return CYPrivate<CArray>::Make(context, data, size, type, ffi->elements[0], context, owner);
+}
+
+JSValueRef Enum::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+ return type.FromFFI(context, ffi, data, initialize, owner);
}
JSValueRef Aggregate::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
- return Struct_privateData::Make(context, data, *this, ffi, context, owner);
+ _assert(!overlap);
+ _assert(signature.count != _not(size_t));
+ return CYPrivate<Struct_privateData>::Make(context, data, *this, ffi, context, owner);
}
JSValueRef Function::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
values[index] = internal->signature_.elements[1 + index].type->FromFFI(context, internal->cif_.arg_types[index], arguments[index]);
JSValueRef value(internal->adapter_(context, count, values, internal->function_));
- if (internal->cif_.rtype != &ffi_type_void)
- internal->signature_.elements[0].type->PoolFFI(NULL, context, internal->cif_.rtype, result, value);
+ internal->signature_.elements[0].type->PoolFFI(NULL, context, internal->cif_.rtype, result, value);
}
static JSValueRef FunctionAdapter_(JSContextRef context, size_t count, JSValueRef values[], JSObjectRef function) {
static JSObjectRef CYMakeFunctor(JSContextRef context, JSObjectRef function, const sig::Signature &signature) {
Closure_privateData *internal(CYMakeFunctor_(context, function, signature, &FunctionAdapter_));
- JSObjectRef object(JSObjectMake(context, Functor_, internal));
+ JSObjectRef object(JSObjectMake(context, cy::Functor::Class_, internal));
// XXX: see above notes about needing to leak
JSValueProtect(CYGetJSContext(context), object);
return object;
return CYCastJSObject(context, CYGetCachedValue(context, name));
}
-static JSObjectRef CYMakeFunctor(JSContextRef context, JSValueRef value, bool variadic, const sig::Signature &signature) {
+static JSValueRef CYMakeFunctor(JSContextRef context, JSValueRef value, bool variadic, const sig::Signature &signature) {
JSObjectRef Function(CYGetCachedObject(context, CYJSString("Function")));
bool function(_jsccall(JSValueIsInstanceOfConstructor, context, value, Function));
CString *internal(reinterpret_cast<CString *>(JSObjectGetPrivate(object)));
ssize_t offset;
- if (!CYGetOffset(pool, context, property, offset))
+ if (JSStringIsEqualToUTF8CString(property, "$cyi"))
+ offset = 0;
+ else if (!CYGetOffset(pool, context, property, offset))
return NULL;
- return CYCastJSValue(context, CYJSString(CYUTF8String(&internal->value_[offset], 1)));
+ sig::Primitive<char> type;
+ return type.FromFFI(context, type.GetFFI(pool), internal->value_ + offset, false, NULL);
} CYCatch(NULL) }
static bool CString_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
CString *internal(reinterpret_cast<CString *>(JSObjectGetPrivate(object)));
ssize_t offset;
- if (!CYGetOffset(pool, context, property, offset))
+ if (JSStringIsEqualToUTF8CString(property, "$cyi"))
+ offset = 0;
+ else if (!CYGetOffset(pool, context, property, offset))
return false;
- const char *data(CYPoolCString(pool, context, value));
- internal->value_[offset] = *data;
+ sig::Primitive<char> type;
+ type.PoolFFI(NULL, context, type.GetFFI(pool), internal->value_ + offset, value);
return true;
} CYCatch(false) }
if (JSValueIsNull(context, value))
return &PointerToVoid_;
JSObjectRef object(CYCastJSObject(context, value));
- JSObjectRef type(CYCastJSObject(context, CYGetProperty(context, object, cyt_s)));
- _assert(JSValueIsObjectOfClass(context, type, Type_privateData::Class_));
+ JSValueRef check(CYGetProperty(context, object, cyt_s));
+ if (JSValueIsUndefined(context, check))
+ CYThrow("could not infer type of argument '%s'", CYPoolCString(pool, context, value));
+ JSObjectRef type(CYCastJSObject(context, check));
+ _assert(JSValueIsObjectOfClass(context, type, CYPrivate<Type_privateData>::Class_));
Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(type)));
return internal->type_;
}
element.type->PoolFFI(&pool, context, ffi, values[index], arguments[index - setups]);
}
- uint8_t value[cif->rtype->size];
+ CYBuffer buffer(context);
+ uint8_t *value(buffer->malloc<uint8_t>(std::max<size_t>(cif->rtype->size, sizeof(ffi_arg)), std::max<size_t>(cif->rtype->alignment, alignof(ffi_arg))));
void (*call)(CYPool &, JSContextRef, ffi_cif *, void (*)(), void *, void **) = &CYCallFunction;
// XXX: this only supports one hook, but it is a bad idea anyway
call = hook->CallFunction;
call(pool, context, cif, function, value, values);
- return signature.elements[0].type->FromFFI(context, cif->rtype, value, initialize);
+ return signature.elements[0].type->FromFFI(context, cif->rtype, value, initialize, buffer);
}
static JSValueRef Functor_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
} CYCatch(NULL) }
JSObjectRef CYMakeType(JSContextRef context, const sig::Type &type) {
- return Type_privateData::Make(context, type);
+ return CYPrivate<Type_privateData>::Make(context, type);
}
extern "C" bool CYBridgeHash(CYPool &pool, CYUTF8String name, const char *&code, unsigned &flags) {
CYThrow("%s", pool.strcat("error caching ", CYPoolCString(pool, context, property), ": ", error.PoolCString(pool), NULL));
}
- JSValueRef result(_jsccall(JSEvaluateScript, context, CYJSString(parsed), NULL, NULL, 0));
-
- if (flags == 0) {
- JSObjectRef cache(CYGetCachedObject(context, CYJSString("cache")));
- CYSetProperty(context, cache, property, result);
+ JSObjectRef cache(CYGetCachedObject(context, CYJSString("cache")));
+
+ JSObjectRef stub;
+ if (flags == CYBridgeType) {
+ stub = CYMakeType(context, sig::Void());
+ CYSetProperty(context, cache, property, stub);
+ } else
+ stub = NULL;
+
+ JSValueRef value(_jsccall(JSEvaluateScript, context, CYJSString(parsed), NULL, NULL, 0));
+
+ switch (flags) {
+ case CYBridgeVoid: {
+ } break;
+
+ case CYBridgeHold: {
+ CYSetProperty(context, cache, property, value);
+ } break;
+
+ case CYBridgeType: {
+ JSObjectRef swap(CYCastJSObject(context, value));
+ void *source(JSObjectGetPrivate(swap));
+ _assert(source != NULL);
+ void *target(JSObjectGetPrivate(stub));
+ _assert(JSObjectSetPrivate(swap, target));
+ _assert(JSObjectSetPrivate(stub, source));
+ value = stub;
+ } break;
}
- return result;
+ return value;
}
return NULL;
} CYCatch(NULL) }
static JSValueRef All_complete_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
- _assert(count == 1);
+ _assert(count == 1 || count == 2);
CYPool pool;
CYUTF8String prefix(CYPoolUTF8String(pool, context, CYJSString(context, arguments[0])));
static JSObjectRef CArray_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
_assert(false);
-} CYCatch(NULL) }
+} CYCatchObject() }
static JSObjectRef CString_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
_assert(false);
-} CYCatch(NULL) }
+} CYCatchObject() }
static JSObjectRef Pointer_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
_assert(false);
-} CYCatch(NULL) }
+} CYCatchObject() }
static JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
CYPool pool;
if (false) {
} else if (count == 1) {
- const char *encoding(CYPoolCString(pool, context, arguments[0]));
- sig::Signature signature;
- sig::Parse(pool, &signature, encoding, &Structor_);
- return CYMakeType(context, *signature.elements[0].type);
+ switch (JSValueGetType(context, arguments[0])) {
+ case kJSTypeString: {
+ const char *encoding(CYPoolCString(pool, context, arguments[0]));
+ sig::Signature signature;
+ sig::Parse(pool, &signature, encoding, &Structor_);
+ return CYMakeType(context, *signature.elements[0].type);
+ } break;
+
+ case kJSTypeObject: {
+ // XXX: accept a set of enum constants and /guess/ at their size
+ _assert(false);
+ } break;
+
+ default:
+ throw CYJSError(context, "incorrect kind of argument to new Type");
+ }
} else if (count == 2) {
JSObjectRef types(CYCastJSObject(context, arguments[0]));
size_t count(CYArrayLength(context, types));
element.name = CYPoolCString(pool, context, name);
JSObjectRef object(CYCastJSObject(context, CYArrayGet(context, types, i)));
- _assert(JSValueIsObjectOfClass(context, object, Type_privateData::Class_));
+ _assert(JSValueIsObjectOfClass(context, object, CYPrivate<Type_privateData>::Class_));
Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
element.type = internal->type_;
+ _assert(element.type != NULL);
}
return CYMakeType(context, type);
} else {
throw CYJSError(context, "incorrect number of arguments to Type constructor");
}
-} CYCatch(NULL) }
+} CYCatchObject() }
static JSValueRef Type_callAsFunction_$With(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], sig::Callable &type, JSValueRef *exception) { CYTry {
Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
element.offset = _not(size_t);
JSObjectRef object(CYCastJSObject(context, arguments[i]));
- _assert(JSValueIsObjectOfClass(context, object, Type_privateData::Class_));
+ _assert(JSValueIsObjectOfClass(context, object, CYPrivate<Type_privateData>::Class_));
Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
element.type = internal->type_;
return CYMakeType(context, *type);
} CYCatch(NULL) }
+static JSValueRef Type_callAsFunction_enumFor(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+ if (count != 1)
+ throw CYJSError(context, "incorrect number of arguments to Type.enumFor");
+ Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
+
+ CYPool pool;
+
+ JSObjectRef constants(CYCastJSObject(context, arguments[0]));
+
+ // XXX: this is, sadly, going to leak
+ JSPropertyNameArrayRef names(JSObjectCopyPropertyNames(context, constants));
+
+ size_t count(JSPropertyNameArrayGetCount(names));
+
+ sig::Enum type(*internal->type_, count);
+ type.constants = new(pool) sig::Constant[count];
+
+ for (size_t index(0); index != count; ++index) {
+ JSStringRef name(JSPropertyNameArrayGetNameAtIndex(names, index));
+ JSValueRef value(CYGetProperty(context, constants, name));
+ _assert(JSValueGetType(context, value) == kJSTypeNumber);
+ CYUTF8String string(CYPoolUTF8String(pool, context, name));
+ type.constants[index].name = string.data;
+ type.constants[index].value = CYCastDouble(context, value);
+ }
+
+ JSPropertyNameArrayRelease(names);
+
+ return CYMakeType(context, type);
+} CYCatch(NULL) }
+
static JSValueRef Type_callAsFunction_functionWith(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
bool variadic(count != 0 && JSValueIsNull(context, arguments[count - 1]));
sig::Function type(variadic);
Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
if (dynamic_cast<sig::Primitive<char> *>(internal->type_) != NULL)
- return CYMakeType(context, sig::String());
+ return CYMakeType(context, sig::String((internal->type_->flags & JOC_TYPE_CONST) != 0));
else
return CYMakeType(context, sig::Pointer(*internal->type_));
} CYCatch(NULL) }
if (sig::Function *function = dynamic_cast<sig::Function *>(internal->type_))
return CYMakeFunctor(context, arguments[0], function->variadic, function->signature);
- CYPool pool;
+ CYBuffer buffer(context);
+
sig::Type *type(internal->type_);
ffi_type *ffi(internal->GetFFI());
- void *data(pool.malloc<void>(ffi->size, ffi->alignment));
- type->PoolFFI(&pool, context, ffi, data, arguments[0]);
- JSValueRef value(type->FromFFI(context, ffi, data));
-
- if (JSValueGetType(context, value) == kJSTypeNumber) {
- JSObjectRef typed(_jsccall(JSObjectCallAsConstructor, context, CYGetCachedObject(context, CYJSString("Number")), 1, &value));
- CYSetProperty(context, typed, cyt_s, object, kJSPropertyAttributeDontEnum);
- value = typed;
+ void *data;
+ if (_this == NULL || CYIsStrictEqual(context, _this, CYGetGlobalObject(context)))
+ data = buffer->malloc<void>(ffi->size, ffi->alignment);
+ else {
+ CYSetProperty(context, buffer, CYJSString("$cyo"), _this, kJSPropertyAttributeDontEnum);
+ data = CYCastPointer<void *>(context, _this);
}
+ type->PoolFFI(buffer, context, ffi, data, arguments[0]);
+ JSValueRef value(type->FromFFI(context, ffi, data, false, buffer));
return value;
} CYCatch(NULL) }
static JSObjectRef Type_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
- if (count != 0)
+ if (count > 1)
throw CYJSError(context, "incorrect number of arguments to Type allocator");
Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
JSObjectRef pointer(CYMakePointer(context, NULL, *internal->type_, NULL, NULL));
Pointer *value(reinterpret_cast<Pointer *>(JSObjectGetPrivate(pointer)));
+
+ sig::Type *type(internal->type_);
ffi_type *ffi(internal->GetFFI());
value->value_ = value->pool_->malloc<void>(ffi->size, ffi->alignment);
- memset(value->value_, 0, ffi->size);
+
+ if (count == 0)
+ memset(value->value_, 0, ffi->size);
+ else
+ type->PoolFFI(value->pool_, context, ffi, value->value_, arguments[0]);
+
return pointer;
-} CYCatch(NULL) }
+} CYCatchObject() }
+// XXX: I don't even think the user should be allowed to do this
static JSObjectRef Functor_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
if (count != 2)
throw CYJSError(context, "incorrect number of arguments to Functor constructor");
const char *encoding(CYPoolCString(pool, context, arguments[1]));
sig::Signature signature;
sig::Parse(pool, &signature, encoding, &Structor_);
- return CYMakeFunctor(context, arguments[0], false, signature);
-} CYCatch(NULL) }
+ // XXX: this can try to return null, and I guess then it just fails
+ return CYCastJSObject(context, CYMakeFunctor(context, arguments[0], false, signature));
+} CYCatchObject() }
static JSValueRef CArray_callAsFunction_toPointer(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
CArray *internal(reinterpret_cast<CArray *>(JSObjectGetPrivate(_this)));
static JSValueRef Functor_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
cy::Functor *internal(reinterpret_cast<cy::Functor *>(JSObjectGetPrivate(_this)));
uint8_t *value(reinterpret_cast<uint8_t *>(internal->value_));
+ _assert(value != NULL);
CYLocalPool pool;
sig::Function function(internal->variadic_);
sig::Copy(pool, function.signature, internal->signature_);
- auto typed(CYDecodeType(pool, &function)); {
- std::ostringstream str;
- Dl_info info;
- if (internal->value_ == NULL)
- str << "NULL";
- else if (dladdr(value, &info) == 0)
- str << internal->value_;
- else {
- str << info.dli_sname;
- off_t offset(value - reinterpret_cast<uint8_t *>(info.dli_saddr));
- if (offset != 0)
- str << "+0x" << std::hex << offset;
- }
-
- typed->identifier_ = new(pool) CYIdentifier(pool.strdup(str.str().c_str()));
- }
+ CYPropertyName *name(internal->GetName(pool));
+ auto typed(CYDecodeType(pool, &function));
std::ostringstream str;
CYOptions options;
CYOutput output(*str.rdbuf(), options);
output.pretty_ = true;
- (new(pool) CYExternal(new(pool) CYString("C"), typed))->Output(output, CYNoFlags);
+ (new(pool) CYExternalExpression(new(pool) CYString("C"), typed, name))->Output(output, CYNoFlags);
return CYCastJSValue(context, CYJSString(str.str()));
} CYCatch(NULL) }
+CYPropertyName *cy::Functor::GetName(CYPool &pool) const {
+ Dl_info info;
+ if (dladdr(reinterpret_cast<void *>(value_), &info) == 0 || strcmp(info.dli_sname, "<redacted>") == 0)
+ return new(pool) CYNumber(reinterpret_cast<uintptr_t>(value_));
+
+ std::ostringstream str;
+ str << info.dli_sname;
+ off_t offset(reinterpret_cast<uint8_t *>(value_) - reinterpret_cast<uint8_t *>(info.dli_saddr));
+ if (offset != 0)
+ str << "+0x" << std::hex << offset;
+ return new(pool) CYString(pool.strdup(str.str().c_str()));
+}
+
static JSValueRef Pointer_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
std::set<void *> *objects(CYCastObjects(context, _this, count, arguments));
} CYCatch(NULL) }
static JSValueRef CString_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
- return CYMakeType(context, sig::String());
+ return CYMakeType(context, sig::String(true));
} CYCatch(NULL) }
static JSValueRef CArray_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
str << "NULL";
else {
str << "&";
- CYStringify(str, string, strlen(string), true);
+ CYStringify(str, string, strlen(string), CYStringifyModeNative);
}
std::string value(str.str());
return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size())));
std::stringbuf out;
CYOptions options;
CYOutput output(out, options);
+ output.pretty_ = true;
(new(pool) CYTypeExpression(CYDecodeType(pool, internal->type_->Copy(pool, ""))))->Output(output, CYNoFlags);
return CYCastJSValue(context, CYJSString(out.str().c_str()));
} CYCatch(NULL) }
{NULL, NULL, NULL, 0}
};
-static JSStaticFunction Functor_staticFunctions[4] = {
+static JSStaticFunction Functor_staticFunctions[5] = {
{"$cya", &Functor_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"toCYON", &Functor_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {"toPointer", &Functor_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"valueOf", &Functor_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{NULL, NULL, 0}
};
-namespace cy {
- JSStaticFunction const * const Functor::StaticFunctions = Functor_staticFunctions;
-}
-
static JSStaticValue Functor_staticValues[2] = {
{"$cyt", &Functor_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{NULL, NULL, NULL, 0}
};
-namespace cy {
- JSStaticValue const * const Functor::StaticValues = Functor_staticValues;
-}
-
static JSStaticValue Type_staticValues[4] = {
{"alignment", &Type_getProperty_alignment, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"name", &Type_getProperty_name, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{NULL, NULL, NULL, 0}
};
-static JSStaticFunction Type_staticFunctions[9] = {
+static JSStaticFunction Type_staticFunctions[10] = {
{"arrayOf", &Type_callAsFunction_arrayOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"blockWith", &Type_callAsFunction_blockWith, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"constant", &Type_callAsFunction_constant, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {"enumFor", &Type_callAsFunction_enumFor, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"functionWith", &Type_callAsFunction_functionWith, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"pointerTo", &Type_callAsFunction_pointerTo, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"withName", &Type_callAsFunction_withName, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{NULL, NULL, 0}
};
-_visible void CYSetArgs(int argc, const char *argv[]) {
+_visible void CYSetArgs(const char *argv0, const char *script, int argc, const char *argv[]) {
JSContextRef context(CYGetJSContext());
- JSValueRef args[argc];
+ JSValueRef args[argc + 2];
for (int i(0); i != argc; ++i)
- args[i] = CYCastJSValue(context, argv[i]);
+ args[i + 2] = CYCastJSValue(context, argv[i]);
- JSObjectRef array(CYObjectMakeArray(context, argc, args));
- JSObjectRef System(CYGetCachedObject(context, CYJSString("System")));
- CYSetProperty(context, System, CYJSString("args"), array);
+ size_t offset;
+ if (script == NULL)
+ offset = 1;
+ else {
+ offset = 0;
+ args[1] = CYCastJSValue(context, CYJSString(script));
+ }
+
+ args[offset] = CYCastJSValue(context, CYJSString(argv0));
+
+ CYSetProperty(context, CYGetCachedObject(context, CYJSString("System")), CYJSString("args"), CYObjectMakeArray(context, argc, args + 2));
+ CYSetProperty(context, CYGetCachedObject(context, CYJSString("process")), CYJSString("argv"), CYObjectMakeArray(context, argc + 2 - offset, args + offset));
}
JSObjectRef CYGetGlobalObject(JSContextRef context) {
JSClassDefinition definition;
definition = kJSClassDefinitionEmpty;
+ definition.attributes = kJSClassAttributeNoAutomaticPrototype;
definition.className = "All";
definition.staticFunctions = All_staticFunctions;
definition.hasProperty = &All_hasProperty;
All_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
+ definition.attributes = kJSClassAttributeNoAutomaticPrototype;
definition.className = "Context";
definition.finalize = &CYFinalize;
- Context::Class_ = JSClassCreate(&definition);
+ CYPrivate<Context>::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.className = "CArray";
definition.getProperty = &CArray_getProperty;
definition.setProperty = &CArray_setProperty;
definition.finalize = &CYFinalize;
- CArray::Class_ = JSClassCreate(&definition);
+ CYPrivate<CArray>::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.className = "CString";
definition.getProperty = &CString_getProperty;
definition.setProperty = &CString_setProperty;
definition.finalize = &CYFinalize;
- CString::Class_ = JSClassCreate(&definition);
+ CYPrivate<CString>::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.className = "Functor";
- definition.staticFunctions = cy::Functor::StaticFunctions;
+ definition.staticFunctions = Functor_staticFunctions;
definition.staticValues = Functor_staticValues;
definition.callAsFunction = &Functor_callAsFunction;
definition.finalize = &CYFinalize;
- Functor_ = JSClassCreate(&definition);
+ cy::Functor::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.className = "Pointer";
definition.getProperty = &Pointer_getProperty;
definition.setProperty = &Pointer_setProperty;
definition.finalize = &CYFinalize;
- Pointer::Class_ = JSClassCreate(&definition);
+ CYPrivate<Pointer>::Class_ = JSClassCreate(&definition);
+
+ definition = kJSClassDefinitionEmpty;
+ definition.className = "Root";
+ definition.finalize = &CYFinalize;
+ CYPrivate<CYRoot>::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.className = "Struct";
definition.setProperty = &Struct_setProperty;
definition.getPropertyNames = &Struct_getPropertyNames;
definition.finalize = &CYFinalize;
- Struct_privateData::Class_ = JSClassCreate(&definition);
+ CYPrivate<Struct_privateData>::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.className = "Type";
definition.callAsFunction = &Type_callAsFunction;
definition.callAsConstructor = &Type_callAsConstructor;
definition.finalize = &CYFinalize;
- Type_privateData::Class_ = JSClassCreate(&definition);
+ CYPrivate<Type_privateData>::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.className = "Global";
Global_ = JSClassCreate(&definition);
Array_s = JSStringCreateWithUTF8CString("Array");
+ constructor_s = JSStringCreateWithUTF8CString("constructor");
cy_s = JSStringCreateWithUTF8CString("$cy");
cyi_s = JSStringCreateWithUTF8CString("$cyi");
cyt_s = JSStringCreateWithUTF8CString("$cyt");
+ cyt__s = JSStringCreateWithUTF8CString("$cyt_");
length_s = JSStringCreateWithUTF8CString("length");
message_s = JSStringCreateWithUTF8CString("message");
name_s = JSStringCreateWithUTF8CString("name");
return reinterpret_cast<Context *>(JSObjectGetPrivate(CYCastJSObject(context, CYGetProperty(context, CYGetGlobalObject(context), cy_s))))->context_;
}
-const char *CYPoolLibraryPath(CYPool &pool) {
+#ifdef __ANDROID__
+char *CYPoolLibraryPath_(CYPool &pool) {
+ FILE *maps(fopen("/proc/self/maps", "r"));
+ struct F { FILE *f; F(FILE *f) : f(f) {}
+ ~F() { fclose(f); } } f(maps);
+
+ size_t function(reinterpret_cast<size_t>(&CYPoolLibraryPath));
+
+ for (;;) {
+ size_t start; size_t end; char flags[8]; unsigned long long offset;
+ int major; int minor; unsigned long long inode; char file[1024];
+ int count(fscanf(maps, "%zx-%zx %7s %llx %x:%x %llu%[ ]%1024[^\n]\n",
+ &start, &end, flags, &offset, &major, &minor, &inode, file, file));
+ if (count < 8) break; else if (start <= function && function < end)
+ return pool.strdup(file);
+ }
+
+ _assert(false);
+}
+#else
+char *CYPoolLibraryPath_(CYPool &pool) {
Dl_info addr;
_assert(dladdr(reinterpret_cast<void *>(&CYPoolLibraryPath), &addr) != 0);
- char *lib(pool.strdup(addr.dli_fname));
+ return pool.strdup(addr.dli_fname);
+}
+#endif
+
+const char *CYPoolLibraryPath(CYPool &pool) {
+ char *lib(CYPoolLibraryPath_(pool));
char *slash(strrchr(lib, '/'));
if (slash == NULL)
*slash = '\0';
slash = strrchr(lib, '/');
- if (slash != NULL && strcmp(slash, "/.libs") == 0)
- *slash = '\0';
+ if (slash != NULL) {
+ if (strcmp(slash, "/.libs") == 0)
+ *slash = '\0';
+ } else if (strcmp(lib, ".libs") == 0)
+ return ".";
return lib;
}
_assert(count == 1);
CYPool pool;
- const char *name(CYPoolCString(pool, context, arguments[0]));
- if (strchr(name, '/') == NULL && (
+ CYUTF8String name(CYPoolUTF8String(pool, context, CYJSString(context, arguments[0])));
+ if (memchr(name.data, '/', name.size) == NULL && (
#ifdef __APPLE__
- dlopen(pool.strcat("/System/Library/Frameworks/", name, ".framework/", name, NULL), RTLD_LAZY | RTLD_GLOBAL) != NULL ||
- dlopen(pool.strcat("/System/Library/PrivateFrameworks/", name, ".framework/", name, NULL), RTLD_LAZY | RTLD_GLOBAL) != NULL ||
+ dlopen(pool.strcat("/System/Library/Frameworks/", name.data, ".framework/", name.data, NULL), RTLD_LAZY | RTLD_GLOBAL) != NULL ||
+ dlopen(pool.strcat("/System/Library/PrivateFrameworks/", name.data, ".framework/", name.data, NULL), RTLD_LAZY | RTLD_GLOBAL) != NULL ||
#endif
false))
return CYJSUndefined(context);
- JSObjectRef resolve(CYCastJSObject(context, CYGetProperty(context, object, CYJSString("resolve"))));
- CYJSString path(context, CYCallAsFunction(context, resolve, NULL, 1, arguments));
+ CYJSString path;
+ CYUTF8String code;
+
+ sqlite3_stmt *statement;
+
+ _sqlcall(sqlite3_prepare(database_,
+ "select "
+ "\"module\".\"code\", "
+ "\"module\".\"flags\" "
+ "from \"module\" "
+ "where"
+ " \"module\".\"name\" = ?"
+ " limit 1"
+ , -1, &statement, NULL));
+
+ _sqlcall(sqlite3_bind_text(statement, 1, name.data, name.size, SQLITE_STATIC));
+
+ if (_sqlcall(sqlite3_step(statement)) != SQLITE_DONE) {
+ code.data = static_cast<const char *>(sqlite3_column_blob(statement, 0));
+ code.size = sqlite3_column_bytes(statement, 0);
+ path = CYJSString(name);
+ code = CYPoolUTF8String(pool, code);
+ } else {
+ JSObjectRef resolve(CYCastJSObject(context, CYGetProperty(context, object, CYJSString("resolve"))));
+ path = CYJSString(context, CYCallAsFunction(context, resolve, NULL, 1, arguments));
+ }
+
+ _sqlcall(sqlite3_finalize(statement));
CYJSString property("exports");
JSObjectRef module(CYCastJSObject(context, cache));
result = CYGetProperty(context, module, property);
} else {
- CYUTF8String code(CYPoolFileUTF8String(pool, CYPoolCString(pool, context, path)));
- _assert(code.data != NULL);
+ if (code.data == NULL) {
+ code = CYPoolFileUTF8String(pool, CYPoolCString(pool, context, path));
+ _assert(code.data != NULL);
+ }
- size_t length(strlen(name));
- if (length >= 5 && strcmp(name + length - 5, ".json") == 0) {
+ size_t length(name.size);
+ if (length >= 5 && strncmp(name.data + length - 5, ".json", 5) == 0) {
JSObjectRef JSON(CYGetCachedObject(context, CYJSString("JSON")));
JSObjectRef parse(CYCastJSObject(context, CYGetProperty(context, JSON, CYJSString("parse"))));
JSValueRef arguments[1] = { CYCastJSValue(context, CYJSString(code)) };
JSObjectRef global(CYGetGlobalObject(context));
- JSObjectRef cy(Context::Make(context, context));
+ JSObjectRef cy(CYPrivate<Context>::Make(context, context));
CYSetProperty(context, global, cy_s, cy, kJSPropertyAttributeDontEnum);
/* Cache Globals {{{ */
CYSetProperty(context, cycript, CYJSString("compile"), &Cycript_compile_callAsFunction);
CYSetProperty(context, cycript, CYJSString("gc"), &Cycript_gc_callAsFunction);
- JSObjectRef CArray(JSObjectMakeConstructor(context, CArray::Class_, &CArray_new));
+ JSObjectRef CArray(JSObjectMakeConstructor(context, CYPrivate<::CArray>::Class_, &CArray_new));
CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, CArray, prototype_s)), Array_prototype);
CYSetProperty(context, cycript, CYJSString("CArray"), CArray);
- JSObjectRef CString(JSObjectMakeConstructor(context, CString::Class_, &CString_new));
+ JSObjectRef CString(JSObjectMakeConstructor(context, CYPrivate<::CString>::Class_, &CString_new));
CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, CString, prototype_s)), String_prototype);
CYSetProperty(context, cycript, CYJSString("CString"), CString);
- JSObjectRef Functor(JSObjectMakeConstructor(context, Functor_, &Functor_new));
- CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Functor, prototype_s)), Function_prototype);
+ JSObjectRef Functor(JSObjectMakeConstructor(context, cy::Functor::Class_, &Functor_new));
+ JSObjectRef Functor_prototype(CYCastJSObject(context, CYGetProperty(context, Functor, prototype_s)));
+ CYSetPrototype(context, Functor_prototype, Function_prototype);
+ CYSetProperty(context, cy, CYJSString("Functor_prototype"), Functor_prototype);
CYSetProperty(context, cycript, CYJSString("Functor"), Functor);
- CYSetProperty(context, cycript, CYJSString("Pointer"), JSObjectMakeConstructor(context, Pointer::Class_, &Pointer_new));
- CYSetProperty(context, cycript, CYJSString("Type"), JSObjectMakeConstructor(context, Type_privateData::Class_, &Type_new));
+ CYSetProperty(context, cycript, CYJSString("Pointer"), JSObjectMakeConstructor(context, CYPrivate<Pointer>::Class_, &Pointer_new));
+
+ JSObjectRef Type(JSObjectMakeConstructor(context, CYPrivate<Type_privateData>::Class_, &Type_new));
+ JSObjectRef Type_prototype(CYCastJSObject(context, CYGetProperty(context, Type, prototype_s)));
+ CYSetPrototype(context, Type_prototype, Function_prototype);
+ CYSetProperty(context, cy, CYJSString("Type_prototype"), Type_prototype);
+ CYSetProperty(context, cycript, CYJSString("Type"), Type);
+
+ JSObjectRef Character_prototype(JSObjectMake(context, NULL, NULL));
+ CYSetPrototype(context, Character_prototype, String_prototype);
+ CYSetProperty(context, cy, CYJSString("Character_prototype"), Character_prototype);
+ CYSetProperty(context, Character_prototype, CYJSString("valueOf"), _jsccall(JSEvaluateScript, context, CYJSString("(function(){return this.charCodeAt(0);})"), NULL, NULL, 0));
JSObjectRef modules(JSObjectMake(context, NULL, NULL));
CYSetProperty(context, cy, CYJSString("modules"), modules);
CYSetPrototype(context, last, cache);
}
- JSObjectRef System(JSObjectMake(context, NULL, NULL));
- CYSetProperty(context, cy, CYJSString("System"), System);
-
- CYSetProperty(context, global, CYJSString("require"), &require_callAsFunction, kJSPropertyAttributeDontEnum);
-
- CYSetProperty(context, global, CYJSString("system"), System);
- CYSetProperty(context, System, CYJSString("args"), CYJSNull(context));
- CYSetProperty(context, System, CYJSString("print"), &System_print);
-
- CYSetProperty(context, global, CYJSString("global"), global);
-
#ifdef __APPLE__
if (&JSWeakObjectMapCreate != NULL) {
JSWeakObjectMapRef weak(JSWeakObjectMapCreate(context, NULL, &CYDestroyWeak));
}
#endif
- CYSetProperty(context, String_prototype, cyt_s, CYMakeType(context, sig::String()), kJSPropertyAttributeDontEnum);
+ CYSetProperty(context, String_prototype, cyt_s, CYMakeType(context, sig::String(true)), kJSPropertyAttributeDontEnum);
CYSetProperty(context, cache, CYJSString("dlerror"), CYMakeFunctor(context, "dlerror", "*"), kJSPropertyAttributeDontEnum);
CYSetProperty(context, cache, CYJSString("RTLD_DEFAULT"), CYCastJSValue(context, reinterpret_cast<intptr_t>(RTLD_DEFAULT)), kJSPropertyAttributeDontEnum);
CYSetProperty(context, cache, CYJSString("ulong"), CYMakeType(context, sig::Primitive<unsigned long>()), kJSPropertyAttributeDontEnum);
CYSetProperty(context, cache, CYJSString("ulonglong"), CYMakeType(context, sig::Primitive<unsigned long long>()), kJSPropertyAttributeDontEnum);
+#ifdef __SIZEOF_INT128__
+ CYSetProperty(context, cache, CYJSString("int128"), CYMakeType(context, sig::Primitive<__int128>()), kJSPropertyAttributeDontEnum);
+ CYSetProperty(context, cache, CYJSString("uint128"), CYMakeType(context, sig::Primitive<unsigned __int128>()), kJSPropertyAttributeDontEnum);
+#endif
+
CYSetProperty(context, cache, CYJSString("float"), CYMakeType(context, sig::Primitive<float>()), kJSPropertyAttributeDontEnum);
CYSetProperty(context, cache, CYJSString("double"), CYMakeType(context, sig::Primitive<double>()), kJSPropertyAttributeDontEnum);
+ CYSetProperty(context, cache, CYJSString("longdouble"), CYMakeType(context, sig::Primitive<long double>()), kJSPropertyAttributeDontEnum);
+
+ CYSetProperty(context, global, CYJSString("require"), &require_callAsFunction, kJSPropertyAttributeDontEnum);
+
+ JSObjectRef System(JSObjectMake(context, NULL, NULL));
+ CYSetProperty(context, all, CYJSString("system"), System);
+ System = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("system")));
+ CYSetProperty(context, cy, CYJSString("System"), System);
+
+ JSObjectRef process(JSObjectMake(context, NULL, NULL));
+ CYSetProperty(context, global, CYJSString("process"), process);
+ CYSetProperty(context, cy, CYJSString("process"), process);
+
+ CYSetProperty(context, System, CYJSString("args"), CYJSNull(context));
+ CYSetProperty(context, System, CYJSString("print"), &System_print);
+
+ CYSetProperty(context, global, CYJSString("global"), global);
+ CYSetProperty(context, global, CYJSString("print"), &Global_print);
for (CYHook *hook : GetHooks())
if (hook->SetupContext != NULL)
projects / cycript.git / blobdiff