#include "Pooling.hpp"
#include "String.hpp"
+const char *sqlite3_column_string(sqlite3_stmt *stmt, int n) {
+ return reinterpret_cast<const char *>(sqlite3_column_text(stmt, n));
+}
+
char *sqlite3_column_pooled(CYPool &pool, sqlite3_stmt *stmt, int n) {
- if (const unsigned char *value = sqlite3_column_text(stmt, n))
- return pool.strdup(reinterpret_cast<const char *>(value));
+ if (const char *value = sqlite3_column_string(stmt, n))
+ return pool.strdup(value);
else return NULL;
}
JSStringRef CYCopyJSString(CYUTF8String value) {
if (memchr(value.data, '\0', value.size) != NULL) {
CYPool pool;
- return CYCopyJSString(pool.memdup(value.data, value.size));
+ return CYCopyJSString(CYPoolUTF16String(pool, value));
} else if (value.data[value.size] != '\0') {
CYPool pool;
- return CYCopyJSString(CYPoolUTF16String(pool, value));
+ return CYCopyJSString(pool.strmemdup(value.data, value.size));
} else {
return CYCopyJSString(value.data);
}
}
/* }}} */
+static JSObjectRef (*JSObjectMakeArray$)(JSContextRef, size_t, const JSValueRef[], JSValueRef *);
+
+static 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);
+ }
+}
+
static JSClassRef All_;
static JSClassRef Context_;
+static JSClassRef CArray_;
static JSClassRef CString_;
JSClassRef Functor_;
static JSClassRef Global_;
JSStringRef Array_s;
JSStringRef cy_s;
JSStringRef cyi_s;
+JSStringRef cyt_s;
JSStringRef length_s;
JSStringRef message_s;
JSStringRef name_s;
delete internal;
}
-void Structor_(CYPool &pool, sig::Type *&type) {
- if (
- type->primitive == sig::pointer_P &&
- type->data.data.type->primitive == sig::struct_P &&
- type->data.data.type->name != NULL &&
- strcmp(type->data.data.type->name, "_objc_class") == 0
- ) {
- type->primitive = sig::typename_P;
- type->data.data.type = NULL;
- return;
- }
-
- if (type->primitive != sig::struct_P || type->name == NULL)
- return;
-
+sig::Type *Structor_(CYPool &pool, sig::Aggregate *aggregate) {
//_assert(false);
+ return aggregate;
}
JSClassRef Type_privateData::Class_;
}
};
+struct CArray :
+ CYOwned
+{
+ Type_privateData *type_;
+ size_t length_;
+
+ CArray(void *value, JSContextRef context, JSObjectRef owner, size_t length, const sig::Type &type, ffi_type *ffi) :
+ CYOwned(value, context, owner),
+ type_(new(*pool_) Type_privateData(type, ffi)),
+ length_(length)
+ {
+ }
+};
+
struct CString :
CYOwned
{
CYOwned
{
Type_privateData *type_;
- size_t length_;
- Pointer(void *value, JSContextRef context, JSObjectRef owner, size_t length, sig::Type *type) :
+ Pointer(void *value, JSContextRef context, JSObjectRef owner, const sig::Type &type) :
CYOwned(value, context, owner),
- type_(new(*pool_) Type_privateData(type)),
- length_(length)
+ type_(new(*pool_) Type_privateData(type))
{
}
- Pointer(void *value, JSContextRef context, JSObjectRef owner, size_t length, const char *encoding) :
+ Pointer(void *value, JSContextRef context, JSObjectRef owner, const char *encoding) :
CYOwned(value, context, owner),
- type_(new(*pool_) Type_privateData(encoding)),
- length_(length)
+ type_(new(*pool_) Type_privateData(encoding))
{
}
};
{
Type_privateData *type_;
- Struct_privateData(JSContextRef context, JSObjectRef owner) :
- CYOwned(NULL, context, owner)
+ Struct_privateData(void *value, JSContextRef context, JSObjectRef owner, const sig::Type &type, ffi_type *ffi) :
+ CYOwned(value, context, owner),
+ type_(new(*pool_) Type_privateData(type, ffi))
{
}
};
-JSObjectRef CYMakeStruct(JSContextRef context, void *data, sig::Type *type, ffi_type *ffi, JSObjectRef owner) {
- Struct_privateData *internal(new Struct_privateData(context, owner));
- CYPool &pool(*internal->pool_);
- Type_privateData *typical(new(pool) Type_privateData(type, ffi));
- internal->type_ = typical;
+JSObjectRef CYMakeCArray(JSContextRef context, void *data, size_t length, const sig::Type &type, ffi_type *ffi, JSObjectRef owner) {
+ CArray *internal(new CArray(data, context, owner, length, type, ffi));
- if (owner != NULL)
- internal->value_ = data;
- else {
- size_t size(typical->GetFFI()->size);
- void *copy(internal->pool_->malloc<void>(size));
- memcpy(copy, data, size);
+ if (owner == NULL) {
+ size_t size(ffi->size * length);
+ void *copy(internal->pool_->malloc<void>(size, ffi->alignment));
+ memcpy(copy, internal->value_, size);
+ internal->value_ = copy;
+ }
+
+ return JSObjectMake(context, CArray_, internal);
+}
+
+JSObjectRef CYMakeCString(JSContextRef context, char *pointer, JSObjectRef owner) {
+ CString *internal(new CString(pointer, context, owner));
+ if (owner == NULL)
+ internal->value_ = internal->pool_->strdup(static_cast<const char *>(internal->value_));
+ return JSObjectMake(context, CString_, internal);
+}
+
+JSObjectRef CYMakeStruct(JSContextRef context, void *data, const sig::Type &type, ffi_type *ffi, JSObjectRef owner) {
+ Struct_privateData *internal(new Struct_privateData(data, context, owner, type, ffi));
+
+ if (owner == NULL) {
+ size_t size(ffi->size);
+ void *copy(internal->pool_->malloc<void>(size, ffi->alignment));
+ memcpy(copy, internal->value_, size);
internal->value_ = copy;
}
return JSValueMakeNumber(context, static_cast<double>(value)); \
}
-CYCastJSValue_(int)
+CYCastJSValue_(signed short int)
+CYCastJSValue_(unsigned short int)
+CYCastJSValue_(signed int)
CYCastJSValue_(unsigned int)
-CYCastJSValue_(long int)
-CYCastJSValue_(long unsigned int)
-CYCastJSValue_(long long int)
-CYCastJSValue_(long long unsigned int)
+CYCastJSValue_(signed long int)
+CYCastJSValue_(unsigned long int)
+CYCastJSValue_(signed long long int)
+CYCastJSValue_(unsigned long long int)
JSValueRef CYJSUndefined(JSContextRef context) {
return JSValueMakeUndefined(context);
return _jsccall(JSObjectGetPropertyAtIndex, context, array, index);
}
-void CYArrayPush(JSContextRef context, JSObjectRef array, JSValueRef value) {
- JSValueRef arguments[1];
- arguments[0] = value;
+void CYArrayPush(JSContextRef context, JSObjectRef array, size_t length, const JSValueRef arguments[]) {
JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype")));
- _jsccall(JSObjectCallAsFunction, context, CYCastJSObject(context, CYGetProperty(context, Array, push_s)), array, 1, arguments);
+ _jsccall(JSObjectCallAsFunction, context, CYCastJSObject(context, CYGetProperty(context, Array, push_s)), array, length, arguments);
+}
+
+void CYArrayPush(JSContextRef context, JSObjectRef array, JSValueRef value) {
+ return CYArrayPush(context, array, 1, &value);
}
+template <size_t Size_>
+class CYArrayBuilder {
+ private:
+ JSContextRef context_;
+ JSObjectRef &array_;
+ size_t size_;
+ JSValueRef values_[Size_];
+
+ void flush() {
+ if (array_ == NULL)
+ array_ = CYObjectMakeArray(context_, size_, values_);
+ else
+ CYArrayPush(context_, array_, size_, values_);
+ }
+
+ public:
+ CYArrayBuilder(JSContextRef context, JSObjectRef &array) :
+ context_(context),
+ array_(array),
+ size_(0)
+ {
+ }
+
+ ~CYArrayBuilder() {
+ flush();
+ }
+
+ void operator ()(JSValueRef value) {
+ if (size_ == Size_) {
+ flush();
+ size_ = 0;
+ }
+
+ values_[size_++] = value;
+ }
+};
+
static JSValueRef System_print(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
FILE *file(stdout);
return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size())));
} CYCatch(NULL) }
-JSObjectRef CYMakePointer(JSContextRef context, void *pointer, size_t length, sig::Type *type, ffi_type *ffi, JSObjectRef owner) {
- Pointer *internal(new Pointer(pointer, context, owner, length, type));
+JSObjectRef CYMakePointer(JSContextRef context, void *pointer, const sig::Type &type, ffi_type *ffi, JSObjectRef owner) {
+ Pointer *internal(new Pointer(pointer, context, owner, type));
return JSObjectMake(context, Pointer_, internal);
}
-JSObjectRef CYMakePointer(JSContextRef context, void *pointer, size_t length, const char *encoding, JSObjectRef owner) {
- Pointer *internal(new Pointer(pointer, context, owner, length, encoding));
+JSObjectRef CYMakePointer(JSContextRef context, void *pointer, const char *encoding, JSObjectRef owner) {
+ Pointer *internal(new Pointer(pointer, context, owner, encoding));
return JSObjectMake(context, Pointer_, internal);
}
-JSObjectRef CYMakeCString(JSContextRef context, char *pointer, JSObjectRef owner) {
- CString *internal(new CString(pointer, context, owner));
- return JSObjectMake(context, CString_, internal);
-}
-
-static JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), const sig::Signature &signature) {
- return JSObjectMake(context, Functor_, new cy::Functor(signature, function));
+static JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), bool variadic, const sig::Signature &signature) {
+ return JSObjectMake(context, Functor_, new cy::Functor(function, variadic, signature));
}
static JSObjectRef CYMakeFunctor(JSContextRef context, const char *symbol, const char *encoding) {
if (function == NULL)
return NULL;
- cy::Functor *internal(new cy::Functor(encoding, function));
+ cy::Functor *internal(new cy::Functor(function, encoding));
++internal->count_;
return JSObjectMake(context, Functor_, internal);
}
}
}
-void CYPoolFFI(CYPool *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) {
- switch (type->primitive) {
- case sig::boolean_P:
- *reinterpret_cast<bool *>(data) = JSValueToBoolean(context, value);
- break;
-
-#define CYPoolFFI_(primitive, native) \
- case sig::primitive ## _P: \
- *reinterpret_cast<native *>(data) = CYCastDouble(context, value); \
- break;
-
- CYPoolFFI_(uchar, unsigned char)
- CYPoolFFI_(char, char)
- CYPoolFFI_(ushort, unsigned short)
- CYPoolFFI_(short, short)
- CYPoolFFI_(ulong, unsigned long)
- CYPoolFFI_(long, long)
- CYPoolFFI_(uint, unsigned int)
- CYPoolFFI_(int, int)
- CYPoolFFI_(ulonglong, unsigned long long)
- CYPoolFFI_(longlong, long long)
- CYPoolFFI_(float, float)
- CYPoolFFI_(double, double)
-
- case sig::array_P: {
- uint8_t *base(reinterpret_cast<uint8_t *>(data));
- JSObjectRef aggregate(JSValueIsObject(context, value) ? (JSObjectRef) value : NULL);
- for (size_t index(0); index != type->data.data.size; ++index) {
- ffi_type *field(ffi->elements[index]);
-
- JSValueRef rhs;
- if (aggregate == NULL)
- rhs = value;
- else {
- rhs = CYGetProperty(context, aggregate, index);
- if (JSValueIsUndefined(context, rhs))
- throw CYJSError(context, "unable to extract array value");
- }
-
- CYPoolFFI(pool, context, type->data.data.type, field, base, rhs);
- // XXX: alignment?
- base += field->size;
- }
- } break;
+namespace sig {
- case sig::pointer_P:
- *reinterpret_cast<void **>(data) = CYCastPointer<void *>(context, value);
- break;
+// XXX: this is somehow not quite a template :/
- case sig::string_P: {
- bool guess(false);
- *reinterpret_cast<const char **>(data) = CYCastPointer<const char *>(context, value, &guess);
- if (guess && pool != NULL)
- *reinterpret_cast<const char **>(data) = CYPoolCString(*pool, context, value);
- } break;
+template <>
+void Primitive<bool>::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+ *reinterpret_cast<bool *>(data) = JSValueToBoolean(context, value);
+}
- case sig::struct_P: {
- uint8_t *base(reinterpret_cast<uint8_t *>(data));
- JSObjectRef aggregate(JSValueIsObject(context, value) ? (JSObjectRef) value : NULL);
- for (size_t index(0); index != type->data.signature.count; ++index) {
- sig::Element *element(&type->data.signature.elements[index]);
- ffi_type *field(ffi->elements[index]);
-
- JSValueRef rhs;
- if (aggregate == NULL)
- rhs = value;
- else {
- rhs = CYGetProperty(context, aggregate, index);
- if (JSValueIsUndefined(context, rhs)) {
- if (element->name != NULL)
- rhs = CYGetProperty(context, aggregate, CYJSString(element->name));
- else
- goto undefined;
- if (JSValueIsUndefined(context, rhs)) undefined:
- throw CYJSError(context, "unable to extract structure value");
- }
- }
-
- CYPoolFFI(pool, context, element->type, field, base, rhs);
- // XXX: alignment?
- base += field->size;
- }
- } break;
+#define CYPoolFFI_(Type_) \
+template <> \
+void Primitive<Type_>::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const { \
+ *reinterpret_cast<Type_ *>(data) = CYCastDouble(context, value); \
+}
- case sig::void_P:
- break;
+CYPoolFFI_(char)
+CYPoolFFI_(double)
+CYPoolFFI_(float)
+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)
- default:
- for (CYHook *hook : GetHooks())
- if (hook->PoolFFI != NULL)
- if ((*hook->PoolFFI)(pool, context, type, ffi, data, value))
- return;
+void Void::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+ _assert(false);
+}
+
+void Unknown::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+ _assert(false);
+}
+
+void String::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+ bool guess(false);
+ *reinterpret_cast<const char **>(data) = CYCastPointer<const char *>(context, value, &guess);
+ if (guess && pool != NULL)
+ *reinterpret_cast<const char **>(data) = CYPoolCString(*pool, context, value);
+}
- CYThrow("unimplemented signature code: '%c''\n", type->primitive);
+void Bits::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) {
+ 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");
+ }
+
+ type.PoolFFI(pool, context, ffi, base, rhs);
+ base += ffi->size;
}
}
-JSValueRef CYFromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) {
- switch (type->primitive) {
- case sig::boolean_P:
- return CYCastJSValue(context, *reinterpret_cast<bool *>(data));
-
-#define CYFromFFI_(primitive, native) \
- case sig::primitive ## _P: \
- return CYCastJSValue(context, *reinterpret_cast<native *>(data)); \
-
- CYFromFFI_(uchar, unsigned char)
- CYFromFFI_(char, char)
- CYFromFFI_(ushort, unsigned short)
- CYFromFFI_(short, short)
- CYFromFFI_(ulong, unsigned long)
- CYFromFFI_(long, long)
- CYFromFFI_(uint, unsigned int)
- CYFromFFI_(int, int)
- CYFromFFI_(ulonglong, unsigned long long)
- CYFromFFI_(longlong, long long)
- CYFromFFI_(float, float)
- CYFromFFI_(double, double)
-
- case sig::array_P:
- if (void *pointer = data)
- return CYMakePointer(context, pointer, type->data.data.size, type->data.data.type, NULL, owner);
- else goto null;
-
- case sig::pointer_P:
- if (void *pointer = *reinterpret_cast<void **>(data))
- return CYMakePointer(context, pointer, _not(size_t), type->data.data.type, NULL, owner);
- else goto null;
-
- case sig::string_P:
- if (char *pointer = *reinterpret_cast<char **>(data))
- return CYMakeCString(context, pointer, owner);
- else goto null;
-
- case sig::struct_P:
- return CYMakeStruct(context, data, type, ffi, owner);
- case sig::void_P:
- return CYJSUndefined(context);
-
- null:
- return CYJSNull(context);
- default:
- for (CYHook *hook : GetHooks())
- if (hook->FromFFI != NULL)
- if (JSValueRef value = (*hook->FromFFI)(context, type, ffi, data, initialize, owner))
- return value;
+void Pointer::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+ bool guess(false);
+ *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)) {
+ 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);
+ *reinterpret_cast<void **>(data) = base;
+ }
+}
- CYThrow("unimplemented signature code: '%c''\n", type->primitive);
+void Array::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+ 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);
+}
+
+void Aggregate::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+ _assert(!overlap);
+
+ uint8_t *base(reinterpret_cast<uint8_t *>(data));
+ JSObjectRef aggregate(JSValueIsObject(context, value) ? (JSObjectRef) value : NULL);
+ for (size_t index(0); index != signature.count; ++index) {
+ sig::Element *element(&signature.elements[index]);
+ ffi_type *field(ffi->elements[index]);
+
+ JSValueRef rhs;
+ if (aggregate == NULL)
+ rhs = value;
+ else {
+ rhs = CYGetProperty(context, aggregate, index);
+ if (JSValueIsUndefined(context, rhs)) {
+ if (element->name != NULL)
+ rhs = CYGetProperty(context, aggregate, CYJSString(element->name));
+ else
+ goto undefined;
+ if (JSValueIsUndefined(context, rhs)) undefined:
+ throw CYJSError(context, "unable to extract structure value");
+ }
+ }
+
+ element->type->PoolFFI(pool, context, field, base, rhs);
+ base += field->size;
}
}
+void Function::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+ _assert(false);
+}
+
+#define CYFromFFI_(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_(float)
+CYFromFFI_(signed char)
+CYFromFFI_(signed int)
+CYFromFFI_(signed long int)
+CYFromFFI_(signed long long int)
+CYFromFFI_(signed short int)
+CYFromFFI_(unsigned char)
+CYFromFFI_(unsigned int)
+CYFromFFI_(unsigned long int)
+CYFromFFI_(unsigned long long int)
+CYFromFFI_(unsigned short int)
+
+JSValueRef Void::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+ return CYJSUndefined(context);
+}
+
+JSValueRef Unknown::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+ _assert(false);
+}
+
+JSValueRef String::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+ if (char *value = *reinterpret_cast<char **>(data))
+ return CYMakeCString(context, value, owner);
+ return CYJSNull(context);
+}
+
+JSValueRef Bits::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+ _assert(false);
+}
+
+JSValueRef Pointer::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+ if (void *value = *reinterpret_cast<void **>(data))
+ return CYMakePointer(context, value, type, NULL, owner);
+ return CYJSNull(context);
+}
+
+JSValueRef Array::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+ return CYMakeCArray(context, data, size, type, ffi->elements[0], owner);
+}
+
+JSValueRef Aggregate::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+ return CYMakeStruct(context, data, *this, ffi, owner);
+}
+
+JSValueRef Function::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+ return CYMakeFunctor(context, reinterpret_cast<void (*)()>(data), variadic, signature);
+}
+
+}
+
void CYExecuteClosure(ffi_cif *cif, void *result, void **arguments, void *arg) {
Closure_privateData *internal(reinterpret_cast<Closure_privateData *>(arg));
JSValueRef values[count];
for (size_t index(0); index != count; ++index)
- values[index] = CYFromFFI(context, internal->signature_.elements[1 + index].type, internal->cif_.arg_types[index], arguments[index]);
+ 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_));
- CYPoolFFI(NULL, context, internal->signature_.elements[0].type, internal->cif_.rtype, result, value);
+ if (internal->cif_.rtype != &ffi_type_void)
+ 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) {
return CYCallAsFunction(context, function, NULL, count, values);
}
+#if defined(__APPLE__) && (defined(__arm__) || defined(__arm64__))
+static void CYFreeFunctor(void *data) {
+ ffi_closure_free(data);
+}
+#else
+static void CYFreeFunctor(void *data) {
+ _syscall(munmap(data, sizeof(ffi_closure)));
+}
+#endif
+
Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, const sig::Signature &signature, JSValueRef (*adapter)(JSContextRef, size_t, JSValueRef[], JSObjectRef)) {
// XXX: in case of exceptions this will leak
- // XXX: in point of fact, this may /need/ to leak :(
Closure_privateData *internal(new Closure_privateData(context, function, adapter, signature));
#if defined(__APPLE__) && (defined(__arm__) || defined(__arm64__))
ffi_status status(ffi_prep_closure_loc(writable, &internal->cif_, &CYExecuteClosure, internal, executable));
_assert(status == FFI_OK);
+ internal->pool_->atexit(&CYFreeFunctor, writable);
internal->value_ = executable;
#else
ffi_closure *closure((ffi_closure *) _syscall(mmap(
_syscall(mprotect(closure, sizeof(*closure), PROT_READ | PROT_EXEC));
+ internal->pool_->atexit(&CYFreeFunctor, closure);
internal->value_ = closure;
#endif
return CYCastJSObject(context, CYGetCachedValue(context, name));
}
-static JSObjectRef CYMakeFunctor(JSContextRef context, JSValueRef value, const sig::Signature &signature) {
+static JSObjectRef CYMakeFunctor(JSContextRef context, JSValueRef value, bool variadic, const sig::Signature &signature) {
JSObjectRef Function(CYGetCachedObject(context, CYJSString("Function")));
bool function(_jsccall(JSValueIsInstanceOfConstructor, context, value, Function));
return CYMakeFunctor(context, function, signature);
} else {
void (*function)()(CYCastPointer<void (*)()>(context, value));
- return CYMakeFunctor(context, function, signature);
+ return CYMakeFunctor(context, function, variadic, signature);
}
}
static bool Index_(CYPool &pool, JSContextRef context, Struct_privateData *internal, JSStringRef property, ssize_t &index, uint8_t *&base) {
Type_privateData *typical(internal->type_);
- sig::Type *type(typical->type_);
+ sig::Aggregate *type(static_cast<sig::Aggregate *>(typical->type_));
if (type == NULL)
return false;
size_t length(strlen(name));
double number(CYCastDouble(name, length));
- size_t count(type->data.signature.count);
+ size_t count(type->signature.count);
if (std::isnan(number)) {
if (property == NULL)
return false;
- sig::Element *elements(type->data.signature.elements);
+ sig::Element *elements(type->signature.elements);
for (size_t local(0); local != count; ++local) {
sig::Element *element(&elements[local]);
return true;
}
-static JSValueRef Pointer_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
- CYPool pool;
- Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
-
- if (JSStringIsEqual(property, length_s))
- return internal->length_ == _not(size_t) ? CYJSUndefined(context) : CYCastJSValue(context, internal->length_);
-
- Type_privateData *typical(internal->type_);
- if (typical->type_ == NULL)
- return NULL;
- sig::Type &type(*typical->type_);
-
+static void *Offset_(CYPool &pool, JSContextRef context, JSStringRef property, void *data, ffi_type *ffi) {
ssize_t offset;
if (JSStringIsEqualToUTF8CString(property, "$cyi"))
offset = 0;
else if (!CYGetOffset(pool, context, property, offset))
return NULL;
+ return reinterpret_cast<uint8_t *>(data) + ffi->size * offset;
+}
- if (type.primitive == sig::function_P)
- return CYMakeFunctor(context, reinterpret_cast<void (*)()>(internal->value_), type.data.signature);
+static JSValueRef Offset_getProperty(CYPool &pool, JSContextRef context, JSStringRef property, void *data, Type_privateData *typical, JSObjectRef owner) {
+ ffi_type *ffi(typical->GetFFI());
+ void *base(Offset_(pool, context, property, data, ffi));
+ if (base == NULL)
+ return NULL;
+ return typical->type_->FromFFI(context, ffi, base, false, owner);
+}
+static bool Offset_setProperty(CYPool &pool, JSContextRef context, JSStringRef property, void *data, Type_privateData *typical, JSValueRef value) {
ffi_type *ffi(typical->GetFFI());
+ void *base(Offset_(pool, context, property, data, ffi));
+ if (base == NULL)
+ return false;
- uint8_t *base(reinterpret_cast<uint8_t *>(internal->value_));
- base += ffi->size * offset;
+ typical->type_->PoolFFI(NULL, context, ffi, base, value);
+ return true;
+}
+static JSValueRef CArray_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+ CYPool pool;
+ CArray *internal(reinterpret_cast<CArray *>(JSObjectGetPrivate(object)));
+ if (JSStringIsEqual(property, length_s))
+ return CYCastJSValue(context, internal->length_);
+ Type_privateData *typical(internal->type_);
JSObjectRef owner(internal->GetOwner() ?: object);
- return CYFromFFI(context, &type, ffi, base, false, owner);
+ return Offset_getProperty(pool, context, property, internal->value_, typical, owner);
} CYCatch(NULL) }
-static bool Pointer_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
+static bool CArray_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
CYPool pool;
Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
Type_privateData *typical(internal->type_);
+ return Offset_setProperty(pool, context, property, internal->value_, typical, value);
+} CYCatch(false) }
- if (typical->type_ == NULL)
- return false;
+static JSValueRef Pointer_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+ CYPool pool;
+ Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
- ssize_t offset;
- if (JSStringIsEqualToUTF8CString(property, "$cyi"))
- offset = 0;
- else if (!CYGetOffset(pool, context, property, offset))
- return false;
+ Type_privateData *typical(internal->type_);
- ffi_type *ffi(typical->GetFFI());
+ if (sig::Function *function = dynamic_cast<sig::Function *>(typical->type_)) {
+ if (!JSStringIsEqualToUTF8CString(property, "$cyi"))
+ return NULL;
+ return CYMakeFunctor(context, reinterpret_cast<void (*)()>(internal->value_), function->variadic, function->signature);
+ }
- uint8_t *base(reinterpret_cast<uint8_t *>(internal->value_));
- base += ffi->size * offset;
+ JSObjectRef owner(internal->GetOwner() ?: object);
+ return Offset_getProperty(pool, context, property, internal->value_, typical, owner);
+} CYCatch(NULL) }
- CYPoolFFI(NULL, context, typical->type_, ffi, base, value);
- return true;
+static bool Pointer_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
+ CYPool pool;
+ Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
+ Type_privateData *typical(internal->type_);
+ return Offset_setProperty(pool, context, property, internal->value_, typical, value);
} CYCatch(false) }
static JSValueRef Struct_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
Struct_privateData *internal(reinterpret_cast<Struct_privateData *>(JSObjectGetPrivate(_this)));
Type_privateData *typical(internal->type_);
- return CYMakePointer(context, internal->value_, _not(size_t), typical->type_, typical->ffi_, _this);
+ return CYMakePointer(context, internal->value_, *typical->type_, typical->ffi_, _this);
+} CYCatch(NULL) }
+
+static JSValueRef Struct_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+ Struct_privateData *internal(reinterpret_cast<Struct_privateData *>(JSObjectGetPrivate(object)));
+ return CYMakeType(context, *internal->type_->type_);
} CYCatch(NULL) }
static JSValueRef Struct_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
CYPool pool;
Struct_privateData *internal(reinterpret_cast<Struct_privateData *>(JSObjectGetPrivate(object)));
Type_privateData *typical(internal->type_);
+ sig::Aggregate *type(static_cast<sig::Aggregate *>(typical->type_));
ssize_t index;
uint8_t *base;
JSObjectRef owner(internal->GetOwner() ?: object);
- return CYFromFFI(context, typical->type_->data.signature.elements[index].type, typical->GetFFI()->elements[index], base, false, owner);
+ return type->signature.elements[index].type->FromFFI(context, typical->GetFFI()->elements[index], base, false, owner);
} CYCatch(NULL) }
static bool Struct_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
CYPool pool;
Struct_privateData *internal(reinterpret_cast<Struct_privateData *>(JSObjectGetPrivate(object)));
Type_privateData *typical(internal->type_);
+ sig::Aggregate *type(static_cast<sig::Aggregate *>(typical->type_));
ssize_t index;
uint8_t *base;
if (!Index_(pool, context, internal, property, index, base))
return false;
- CYPoolFFI(NULL, context, typical->type_->data.signature.elements[index].type, typical->GetFFI()->elements[index], base, value);
+ type->signature.elements[index].type->PoolFFI(NULL, context, typical->GetFFI()->elements[index], base, value);
return true;
} CYCatch(false) }
static void Struct_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
Struct_privateData *internal(reinterpret_cast<Struct_privateData *>(JSObjectGetPrivate(object)));
Type_privateData *typical(internal->type_);
- sig::Type *type(typical->type_);
+ sig::Aggregate *type(static_cast<sig::Aggregate *>(typical->type_));
if (type == NULL)
return;
- size_t count(type->data.signature.count);
- sig::Element *elements(type->data.signature.elements);
+ size_t count(type->signature.count);
+ sig::Element *elements(type->signature.elements);
char number[32];
}
}
+static sig::Void Void_;
+static sig::Pointer PointerToVoid_(Void_);
+
+static sig::Type *CYGetType(CYPool &pool, JSContextRef context, JSValueRef value) {
+ 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_));
+ Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(type)));
+ return internal->type_;
+}
+
void CYCallFunction(CYPool &pool, JSContextRef context, ffi_cif *cif, void (*function)(), void *value, void **values) {
ffi_call(cif, function, value, values);
}
-JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef arguments[], bool initialize, sig::Signature *signature, ffi_cif *cif, void (*function)()) {
- if (setups + count != signature->count - 1)
- throw CYJSError(context, "incorrect number of arguments to ffi function");
+JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef arguments[], bool initialize, bool variadic, const sig::Signature &signature, ffi_cif *cif, void (*function)()) {
+ size_t have(setups + count);
+ size_t need(signature.count - 1);
+
+ if (have < need)
+ throw CYJSError(context, "insufficient number of arguments to ffi function");
+
+ ffi_cif corrected;
+ sig::Element *elements(signature.elements);
- size_t size(setups + count);
- void *values[size];
+ if (have > need) {
+ if (!variadic)
+ throw CYJSError(context, "exorbitant number of arguments to ffi function");
+
+ elements = new (pool) sig::Element[have + 1];
+ memcpy(elements, signature.elements, sizeof(sig::Element) * (need + 1));
+
+ for (size_t index(need); index != have; ++index) {
+ sig::Element &element(elements[index + 1]);
+ element.name = NULL;
+ element.offset = _not(size_t);
+ element.type = CYGetType(pool, context, arguments[index - setups]);
+ }
+
+ sig::Signature extended;
+ extended.elements = elements;
+ extended.count = have + 1;
+ sig::sig_ffi_cif(pool, signature.count, extended, &corrected);
+ cif = &corrected;
+ }
+
+ void *values[have];
memcpy(values, setup, sizeof(void *) * setups);
- for (size_t index(setups); index != size; ++index) {
- sig::Element *element(&signature->elements[index + 1]);
+ for (size_t index(setups); index != have; ++index) {
+ sig::Element &element(elements[index + 1]);
ffi_type *ffi(cif->arg_types[index]);
- // XXX: alignment?
- values[index] = new(pool) uint8_t[ffi->size];
- CYPoolFFI(&pool, context, element->type, ffi, values[index], arguments[index - setups]);
+ values[index] = pool.malloc<uint8_t>(ffi->size, ffi->alignment);
+ element.type->PoolFFI(&pool, context, ffi, values[index], arguments[index - setups]);
}
uint8_t value[cif->rtype->size];
call = hook->CallFunction;
call(pool, context, cif, function, value, values);
- return CYFromFFI(context, signature->elements[0].type, cif->rtype, value, initialize);
+ return signature.elements[0].type->FromFFI(context, cif->rtype, value, initialize);
}
static JSValueRef Functor_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
CYPool pool;
cy::Functor *internal(reinterpret_cast<cy::Functor *>(JSObjectGetPrivate(object)));
- return CYCallFunction(pool, context, 0, NULL, count, arguments, false, &internal->signature_, &internal->cif_, internal->GetValue());
+ return CYCallFunction(pool, context, 0, NULL, count, arguments, false, internal->variadic_, internal->signature_, &internal->cif_, internal->GetValue());
} CYCatch(NULL) }
static JSValueRef Pointer_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
- if (internal->type_->type_->primitive != sig::function_P)
+ if (dynamic_cast<sig::Function *>(internal->type_->type_) == NULL)
throw CYJSError(context, "cannot call a pointer to non-function");
JSObjectRef functor(CYCastJSObject(context, CYGetProperty(context, object, cyi_s)));
return CYCallAsFunction(context, functor, _this, count, arguments);
} CYCatch(NULL) }
-JSObjectRef CYMakeType(JSContextRef context, const char *encoding) {
- Type_privateData *internal(new Type_privateData(encoding));
- return JSObjectMake(context, Type_privateData::Class_, internal);
-}
-
-JSObjectRef CYMakeType(JSContextRef context, sig::Type *type) {
+JSObjectRef CYMakeType(JSContextRef context, const sig::Type &type) {
Type_privateData *internal(new Type_privateData(type));
return JSObjectMake(context, Type_privateData::Class_, internal);
}
-JSObjectRef CYMakeType(JSContextRef context, sig::Signature *signature) {
- CYPool pool;
-
- sig::Type type;
- type.name = NULL;
- type.flags = 0;
-
- type.primitive = sig::function_P;
- sig::Copy(pool, type.data.signature, *signature);
-
- return CYMakeType(context, &type);
-}
-
-extern "C" const char *CYBridgeHash(CYPool &pool, CYUTF8String name) {
+extern "C" bool CYBridgeHash(CYPool &pool, CYUTF8String name, const char *&code, unsigned &flags) {
sqlite3_stmt *statement;
_sqlcall(sqlite3_prepare(database_,
"select "
- "\"cache\".\"value\" "
+ "\"cache\".\"code\", "
+ "\"cache\".\"flags\" "
"from \"cache\" "
"where"
" \"cache\".\"system\" & " CY_SYSTEM " == " CY_SYSTEM " and"
_sqlcall(sqlite3_bind_text(statement, 1, name.data, name.size, SQLITE_STATIC));
- const char *value;
+ bool success;
if (_sqlcall(sqlite3_step(statement)) == SQLITE_DONE)
- value = NULL;
- else
- value = sqlite3_column_pooled(pool, statement, 0);
+ success = false;
+ else {
+ success = true;
+ code = sqlite3_column_pooled(pool, statement, 0);
+ flags = sqlite3_column_int(statement, 1);
+ }
_sqlcall(sqlite3_finalize(statement));
- return value;
+ return success;
}
static bool All_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
+ if (JSStringIsEqualToUTF8CString(property, "errno"))
+ return true;
+
JSObjectRef global(CYGetGlobalObject(context));
JSObjectRef cycript(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Cycript"))));
JSObjectRef alls(CYCastJSObject(context, CYGetProperty(context, cycript, CYJSString("alls"))));
return true;
CYPool pool;
- if (CYBridgeHash(pool, CYPoolUTF8String(pool, context, property)) != NULL)
+ const char *code;
+ unsigned flags;
+ if (CYBridgeHash(pool, CYPoolUTF8String(pool, context, property), code, flags))
return true;
return false;
}
static JSValueRef All_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+ if (JSStringIsEqualToUTF8CString(property, "errno"))
+ return CYCastJSValue(context, errno);
+
JSObjectRef global(CYGetGlobalObject(context));
JSObjectRef cycript(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Cycript"))));
JSObjectRef alls(CYCastJSObject(context, CYGetProperty(context, cycript, CYJSString("alls"))));
return value;
CYPool pool;
- if (const char *code = CYBridgeHash(pool, CYPoolUTF8String(pool, context, property))) {
- JSValueRef result(_jsccall(JSEvaluateScript, context, CYJSString(CYPoolCode(pool, code)), NULL, NULL, 0));
- CYSetProperty(context, object, property, result, kJSPropertyAttributeDontEnum);
+ const char *code;
+ unsigned flags;
+ if (CYBridgeHash(pool, CYPoolUTF8String(pool, context, property), code, flags)) {
+ CYUTF8String parsed;
+
+ try {
+ parsed = CYPoolCode(pool, code);
+ } catch (const CYException &error) {
+ 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);
+ }
+
return result;
}
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);
+ CYPool pool;
+ CYUTF8String prefix(CYPoolUTF8String(pool, context, CYJSString(context, arguments[0])));
+
+ JSObjectRef array(NULL);
+
+ {
+ CYArrayBuilder<1024> values(context, array);
+
+ sqlite3_stmt *statement;
+
+ if (prefix.size == 0)
+ _sqlcall(sqlite3_prepare(database_,
+ "select "
+ "\"cache\".\"name\" "
+ "from \"cache\" "
+ "where"
+ " \"cache\".\"system\" & " CY_SYSTEM " == " CY_SYSTEM
+ , -1, &statement, NULL));
+ else {
+ _sqlcall(sqlite3_prepare(database_,
+ "select "
+ "\"cache\".\"name\" "
+ "from \"cache\" "
+ "where"
+ " \"cache\".\"name\" >= ? and \"cache\".\"name\" < ? and "
+ " \"cache\".\"system\" & " CY_SYSTEM " == " CY_SYSTEM
+ , -1, &statement, NULL));
+
+ _sqlcall(sqlite3_bind_text(statement, 1, prefix.data, prefix.size, SQLITE_STATIC));
+
+ char *after(pool.strndup(prefix.data, prefix.size));
+ ++after[prefix.size - 1];
+ _sqlcall(sqlite3_bind_text(statement, 2, after, prefix.size, SQLITE_STATIC));
+ }
+
+ while (_sqlcall(sqlite3_step(statement)) != SQLITE_DONE)
+ values(CYCastJSValue(context, CYJSString(sqlite3_column_string(statement, 0))));
+
+ _sqlcall(sqlite3_finalize(statement));
+ }
+
+ return array;
+} CYCatch(NULL) }
+
static void All_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
JSObjectRef global(CYGetGlobalObject(context));
JSObjectRef cycript(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Cycript"))));
}
}
+static JSObjectRef CArray_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+ _assert(false);
+} CYCatch(NULL) }
+
static JSObjectRef CString_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
- if (count != 1)
- throw CYJSError(context, "incorrect number of arguments to CString constructor");
- char *value(CYCastPointer<char *>(context, arguments[0]));
- return CYMakeCString(context, value, NULL);
+ _assert(false);
} CYCatch(NULL) }
static JSObjectRef Pointer_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 Pointer constructor");
-
- CYPool pool;
-
- void *value(CYCastPointer<void *>(context, arguments[0]));
- const char *type(CYPoolCString(pool, context, arguments[1]));
-
- sig::Signature signature;
- sig::Parse(pool, &signature, type, &Structor_);
-
- return CYMakePointer(context, value, _not(size_t), signature.elements[0].type, NULL, NULL);
+ _assert(false);
} CYCatch(NULL) }
static JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
if (false) {
} else if (count == 1) {
- const char *type(CYPoolCString(pool, context, arguments[0]));
- return CYMakeType(context, type);
+ const char *encoding(CYPoolCString(pool, context, arguments[0]));
+ sig::Signature signature;
+ sig::Parse(pool, &signature, encoding, &Structor_);
+ return CYMakeType(context, *signature.elements[0].type);
} else if (count == 2) {
JSObjectRef types(CYCastJSObject(context, arguments[0]));
size_t count(CYArrayLength(context, types));
JSObjectRef names(CYCastJSObject(context, arguments[1]));
- sig::Type type;
- type.name = NULL;
- type.flags = 0;
-
- type.primitive = sig::struct_P;
- type.data.signature.elements = new(pool) sig::Element[count];
- type.data.signature.count = count;
+ sig::Aggregate type(false);
+ type.signature.elements = new(pool) sig::Element[count];
+ type.signature.count = count;
for (size_t i(0); i != count; ++i) {
- sig::Element &element(type.data.signature.elements[i]);
+ sig::Element &element(type.signature.elements[i]);
element.offset = _not(size_t);
JSValueRef name(CYArrayGet(context, names, i));
element.type = internal->type_;
}
- return CYMakeType(context, &type);
+ return CYMakeType(context, type);
} else {
throw CYJSError(context, "incorrect number of arguments to Type constructor");
}
} CYCatch(NULL) }
-static JSValueRef Type_callAsFunction_$With(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], sig::Primitive primitive, JSValueRef *exception) { CYTry {
+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)));
CYPool pool;
- sig::Type type;
- type.name = NULL;
- type.flags = 0;
+ type.signature.elements = new(pool) sig::Element[1 + count];
+ type.signature.count = 1 + count;
- type.primitive = primitive;
- type.data.signature.elements = new(pool) sig::Element[1 + count];
- type.data.signature.count = 1 + count;
-
- type.data.signature.elements[0].name = NULL;
- type.data.signature.elements[0].type = internal->type_;
- type.data.signature.elements[0].offset = _not(size_t);
+ type.signature.elements[0].name = NULL;
+ type.signature.elements[0].type = internal->type_;
+ type.signature.elements[0].offset = _not(size_t);
for (size_t i(0); i != count; ++i) {
- sig::Element &element(type.data.signature.elements[i + 1]);
+ sig::Element &element(type.signature.elements[i + 1]);
element.name = NULL;
element.offset = _not(size_t);
element.type = internal->type_;
}
- return CYMakeType(context, &type);
+ return CYMakeType(context, type);
} CYCatch(NULL) }
static JSValueRef Type_callAsFunction_arrayOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
if (index == _not(size_t))
throw CYJSError(context, "invalid array size used with Type.arrayOf");
- sig::Type type;
- type.name = NULL;
- type.flags = 0;
-
- type.primitive = sig::array_P;
- type.data.data.type = internal->type_;
- type.data.data.size = index;
-
- return CYMakeType(context, &type);
+ sig::Array type(*internal->type_, index);
+ return CYMakeType(context, type);
} CYCatch(NULL) }
static JSValueRef Type_callAsFunction_blockWith(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
- return Type_callAsFunction_$With(context, object, _this, count, arguments, sig::block_P, exception);
+ sig::Block type;
+ return Type_callAsFunction_$With(context, object, _this, count, arguments, type, exception);
}
static JSValueRef Type_callAsFunction_constant(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
throw CYJSError(context, "incorrect number of arguments to Type.constant");
Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
- sig::Type type(*internal->type_);
- type.flags |= JOC_TYPE_CONST;
- return CYMakeType(context, &type);
-} CYCatch(NULL) }
-
-static JSValueRef Type_callAsFunction_long(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
- if (count != 0)
- throw CYJSError(context, "incorrect number of arguments to Type.long");
- Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
-
- sig::Type type(*internal->type_);
-
- switch (type.primitive) {
- case sig::short_P: type.primitive = sig::int_P; break;
- case sig::int_P: type.primitive = sig::long_P; break;
- case sig::long_P: type.primitive = sig::longlong_P; break;
- default: throw CYJSError(context, "invalid type argument to Type.long");
- }
-
- return CYMakeType(context, &type);
-} CYCatch(NULL) }
-
-static JSValueRef Type_callAsFunction_short(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
- if (count != 0)
- throw CYJSError(context, "incorrect number of arguments to Type.short");
- Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
-
- sig::Type type(*internal->type_);
-
- switch (type.primitive) {
- case sig::int_P: type.primitive = sig::short_P; break;
- case sig::long_P: type.primitive = sig::int_P; break;
- case sig::longlong_P: type.primitive = sig::long_P; break;
- default: throw CYJSError(context, "invalid type argument to Type.short");
- }
-
- return CYMakeType(context, &type);
-} CYCatch(NULL) }
-
-static JSValueRef Type_callAsFunction_signed(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
- if (count != 0)
- throw CYJSError(context, "incorrect number of arguments to Type.signed");
- Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
-
- sig::Type type(*internal->type_);
-
- switch (type.primitive) {
- case sig::char_P: case sig::uchar_P: type.primitive = sig::char_P; break;
- case sig::short_P: case sig::ushort_P: type.primitive = sig::short_P; break;
- case sig::int_P: case sig::uint_P: type.primitive = sig::int_P; break;
- case sig::long_P: case sig::ulong_P: type.primitive = sig::long_P; break;
- case sig::longlong_P: case sig::ulonglong_P: type.primitive = sig::longlong_P; break;
- default: throw CYJSError(context, "invalid type argument to Type.signed");
- }
-
- return CYMakeType(context, &type);
-} CYCatch(NULL) }
-
-static JSValueRef Type_callAsFunction_unsigned(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
- if (count != 0)
- throw CYJSError(context, "incorrect number of arguments to Type.unsigned");
- Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
-
- sig::Type type(*internal->type_);
-
- switch (type.primitive) {
- case sig::char_P: case sig::uchar_P: type.primitive = sig::uchar_P; break;
- case sig::short_P: case sig::ushort_P: type.primitive = sig::ushort_P; break;
- case sig::int_P: case sig::uint_P: type.primitive = sig::uint_P; break;
- case sig::long_P: case sig::ulong_P: type.primitive = sig::ulong_P; break;
- case sig::longlong_P: case sig::ulonglong_P: type.primitive = sig::ulonglong_P; break;
- default: throw CYJSError(context, "invalid type argument to Type.unsigned");
- }
-
- return CYMakeType(context, &type);
+ CYPool pool;
+ sig::Type *type(internal->type_->Copy(pool));
+ type->flags |= JOC_TYPE_CONST;
+ 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) {
- return Type_callAsFunction_$With(context, object, _this, count, arguments, sig::function_P, exception);
+ bool variadic(count != 0 && JSValueIsNull(context, arguments[count - 1]));
+ sig::Function type(variadic);
+ return Type_callAsFunction_$With(context, object, _this, variadic ? count - 1 : count, arguments, type, exception);
}
static JSValueRef Type_callAsFunction_pointerTo(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
throw CYJSError(context, "incorrect number of arguments to Type.pointerTo");
Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
- sig::Type type;
- type.name = NULL;
-
- if (internal->type_->primitive == sig::char_P) {
- type.flags = internal->type_->flags;
- type.primitive = sig::string_P;
- type.data.data.type = NULL;
- type.data.data.size = 0;
- } else {
- type.flags = 0;
- type.primitive = sig::pointer_P;
- type.data.data.type = internal->type_;
- type.data.data.size = 0;
- }
-
- return CYMakeType(context, &type);
+ if (dynamic_cast<sig::Primitive<char> *>(internal->type_) != NULL)
+ return CYMakeType(context, sig::String());
+ else
+ return CYMakeType(context, sig::Pointer(*internal->type_));
} CYCatch(NULL) }
static JSValueRef Type_callAsFunction_withName(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
CYPool pool;
- const char *name(CYPoolCString(pool, context, arguments[0]));
-
- sig::Type type(*internal->type_);
- type.name = name;
- return CYMakeType(context, &type);
+ return CYMakeType(context, *internal->type_->Copy(pool, CYPoolCString(pool, context, arguments[0])));
} CYCatch(NULL) }
static JSValueRef Type_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
throw CYJSError(context, "incorrect number of arguments to type cast function");
Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
- if (internal->type_->primitive == sig::function_P)
- return CYMakeFunctor(context, arguments[0], internal->type_->data.signature);
+ if (sig::Function *function = dynamic_cast<sig::Function *>(internal->type_))
+ return CYMakeFunctor(context, arguments[0], function->variadic, function->signature);
+ CYPool pool;
sig::Type *type(internal->type_);
ffi_type *ffi(internal->GetFFI());
- // XXX: alignment?
- uint8_t value[ffi->size];
- CYPool pool;
- CYPoolFFI(&pool, context, type, ffi, value, arguments[0]);
- return CYFromFFI(context, type, ffi, value);
+
+ 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;
+ }
+
+ return value;
} CYCatch(NULL) }
static JSObjectRef Type_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
throw CYJSError(context, "incorrect number of arguments to Type allocator");
Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
- sig::Type *type(internal->type_);
- size_t length;
-
- if (type->primitive != sig::array_P)
- length = _not(size_t);
- else {
- length = type->data.data.size;
- type = type->data.data.type;
- }
-
- JSObjectRef pointer(CYMakePointer(context, NULL, length, type, NULL, NULL));
+ JSObjectRef pointer(CYMakePointer(context, NULL, *internal->type_, NULL, NULL));
Pointer *value(reinterpret_cast<Pointer *>(JSObjectGetPrivate(pointer)));
- value->value_ = value->pool_->malloc<void>(internal->GetFFI()->size);
- memset(value->value_, 0, internal->GetFFI()->size);
+ ffi_type *ffi(internal->GetFFI());
+ value->value_ = value->pool_->malloc<void>(ffi->size, ffi->alignment);
+ memset(value->value_, 0, ffi->size);
return pointer;
} CYCatch(NULL) }
const char *encoding(CYPoolCString(pool, context, arguments[1]));
sig::Signature signature;
sig::Parse(pool, &signature, encoding, &Structor_);
- return CYMakeFunctor(context, arguments[0], signature);
+ return CYMakeFunctor(context, arguments[0], false, signature);
+} CYCatch(NULL) }
+
+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)));
+ JSObjectRef owner(internal->GetOwner() ?: object);
+ return CYMakePointer(context, internal->value_, *internal->type_->type_, NULL, owner);
} CYCatch(NULL) }
static JSValueRef CString_callAsFunction_toPointer(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
CString *internal(reinterpret_cast<CString *>(JSObjectGetPrivate(_this)));
-
- sig::Type type;
- type.name = NULL;
- type.flags = 0;
-
- type.primitive = sig::char_P;
- type.data.data.type = NULL;
- type.data.data.size = 0;
-
- return CYMakePointer(context, internal->value_, _not(size_t), &type, NULL, NULL);
+ JSObjectRef owner(internal->GetOwner() ?: object);
+ return CYMakePointer(context, internal->value_, sig::Primitive<char>(), NULL, owner);
} CYCatch(NULL) }
static JSValueRef Functor_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
CYPool pool;
cy::Functor *internal(reinterpret_cast<cy::Functor *>(JSObjectGetPrivate(_this)));
- sig::Type type;
- type.name = NULL;
- type.flags = 0;
+ sig::Function type(internal->variadic_);
+ sig::Copy(pool, type.signature, internal->signature_);
- type.primitive = sig::function_P;
- sig::Copy(pool, type.data.signature, internal->signature_);
-
- return CYMakePointer(context, internal->value_, _not(size_t), &type, NULL, NULL);
+ return CYMakePointer(context, internal->value_, type, NULL, NULL);
} CYCatch(NULL) }
static JSValueRef Pointer_callAsFunction_toPointer(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
std::set<void *> *objects(CYCastObjects(context, _this, count, arguments));
Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(_this)));
- if (internal->length_ != _not(size_t)) {
- JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype")));
- JSObjectRef toCYON(CYCastJSObject(context, CYGetProperty(context, Array, toCYON_s)));
- return CYCallAsFunction(context, toCYON, _this, count, arguments);
- } else if (internal->type_->type_ == NULL) pointer: {
- CYLocalPool pool;
- std::ostringstream str;
-
- sig::Type type;
- type.name = NULL;
- type.flags = 0;
-
- type.primitive = sig::pointer_P;
- type.data.data.type = internal->type_->type_;
- type.data.data.size = 0;
-
- CYOptions options;
- CYOutput output(*str.rdbuf(), options);
- (new(pool) CYTypeExpression(Decode(pool, &type)))->Output(output, CYNoFlags);
-
- str << "(" << internal->value_ << ")";
- std::string value(str.str());
- return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size())));
- } else try {
+
+ try {
JSValueRef value(CYGetProperty(context, _this, cyi_s));
- if (JSValueIsUndefined(context, value))
- goto pointer;
- CYPool pool;
- return CYCastJSValue(context, pool.strcat("&", CYPoolCCYON(pool, context, value, objects), NULL));
+ if (!JSValueIsUndefined(context, value)) {
+ CYPool pool;
+ return CYCastJSValue(context, pool.strcat("&", CYPoolCCYON(pool, context, value, objects), NULL));
+ }
} catch (const CYException &e) {
- goto pointer;
+ // XXX: it might be interesting to include this error
}
+
+ CYLocalPool pool;
+ std::ostringstream str;
+
+ sig::Pointer type(*internal->type_->type_);
+
+ CYOptions options;
+ CYOutput output(*str.rdbuf(), options);
+ (new(pool) CYTypeExpression(CYDecodeType(pool, &type)))->Output(output, CYNoFlags);
+
+ str << "(" << internal->value_ << ")";
+ std::string value(str.str());
+ return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size())));
} CYCatch(NULL) }
static JSValueRef CString_getProperty_length(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
return CYCastJSValue(context, strlen(string));
} CYCatch(NULL) }
-static JSValueRef CString_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
- sig::Type type;
- type.name = NULL;
- type.flags = 0;
-
- type.primitive = sig::char_P;
- type.data.data.type = NULL;
- type.data.data.size = 0;
+static JSValueRef CString_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+ return CYMakeType(context, sig::String());
+} CYCatch(NULL) }
- return CYMakeType(context, &type);
+static JSValueRef CArray_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+ CArray *internal(reinterpret_cast<CArray *>(JSObjectGetPrivate(object)));
+ sig::Array type(*internal->type_->type_, internal->length_);
+ return CYMakeType(context, type);
} CYCatch(NULL) }
-static JSValueRef Pointer_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+static JSValueRef Pointer_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
- return CYMakeType(context, internal->type_->type_);
+ sig::Pointer type(*internal->type_->type_);
+ return CYMakeType(context, type);
} CYCatch(NULL) }
static JSValueRef CString_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(_this)));
const char *string(static_cast<const char *>(internal->value_));
std::ostringstream str;
- str << "&";
- CYStringify(str, string, strlen(string), true);
+ if (string == NULL)
+ str << "NULL";
+ else {
+ str << "&";
+ CYStringify(str, string, strlen(string), true);
+ }
std::string value(str.str());
return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size())));
} CYCatch(NULL) }
return CYCastJSValue(context, string);
} CYCatch(NULL) }
-static JSValueRef Functor_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+static JSValueRef Functor_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
cy::Functor *internal(reinterpret_cast<cy::Functor *>(JSObjectGetPrivate(object)));
- return CYMakeType(context, &internal->signature_);
+ CYPool pool;
+ sig::Function type(internal->variadic_);
+ sig::Copy(pool, type.signature, internal->signature_);
+ return CYMakeType(context, type);
} CYCatch(NULL) }
static JSValueRef Type_getProperty_alignment(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
static JSValueRef Type_getProperty_name(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
- return CYCastJSValue(context, internal->type_->name);
+ return CYCastJSValue(context, internal->type_->GetName());
} CYCatch(NULL) }
static JSValueRef Type_getProperty_size(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
std::stringbuf out;
CYOptions options;
CYOutput output(out, options);
- (new(pool) CYTypeExpression(Decode(pool, internal->type_)))->Output(output, CYNoFlags);
+ (new(pool) CYTypeExpression(CYDecodeType(pool, internal->type_)))->Output(output, CYNoFlags);
return CYCastJSValue(context, CYJSString(out.str().c_str()));
} CYCatch(NULL) }
return Type_callAsFunction_toString(context, object, _this, count, arguments, exception);
}
+static JSStaticFunction All_staticFunctions[2] = {
+ {"cy$complete", &All_complete_callAsFunction, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {NULL, NULL, 0}
+};
+
+static JSStaticFunction CArray_staticFunctions[4] = {
+ {"toJSON", &CYValue_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {"toPointer", &CArray_callAsFunction_toPointer, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {"valueOf", &CYValue_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {NULL, NULL, 0}
+};
+
+static JSStaticValue CArray_staticValues[2] = {
+ {"$cyt", &CArray_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {NULL, NULL, NULL, 0}
+};
+
static JSStaticFunction CString_staticFunctions[6] = {
{"toCYON", &CString_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"toJSON", &CYValue_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
static JSStaticValue CString_staticValues[3] = {
{"length", &CString_getProperty_length, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
- {"type", &CString_getProperty_type, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {"$cyt", &CString_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{NULL, NULL, NULL, 0}
};
};
static JSStaticValue Pointer_staticValues[2] = {
- {"type", &Pointer_getProperty_type, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {"$cyt", &Pointer_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{NULL, NULL, NULL, 0}
};
{NULL, NULL, 0}
};
+static JSStaticValue Struct_staticValues[2] = {
+ {"$cyt", &Struct_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {NULL, NULL, NULL, 0}
+};
+
static JSStaticFunction Functor_staticFunctions[5] = {
{"$cya", &Functor_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"toCYON", &CYValue_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
}
static JSStaticValue Functor_staticValues[2] = {
- {"type", &Functor_getProperty_type, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {"$cyt", &Functor_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{NULL, NULL, NULL, 0}
};
{NULL, NULL, NULL, 0}
};
-static JSStaticFunction Type_staticFunctions[14] = {
+static JSStaticFunction Type_staticFunctions[10] = {
{"arrayOf", &Type_callAsFunction_arrayOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"blockWith", &Type_callAsFunction_blockWith, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"constant", &Type_callAsFunction_constant, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"functionWith", &Type_callAsFunction_functionWith, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
- {"long", &Type_callAsFunction_long, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"pointerTo", &Type_callAsFunction_pointerTo, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
- {"short", &Type_callAsFunction_short, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
- {"signed", &Type_callAsFunction_signed, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"withName", &Type_callAsFunction_withName, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"toCYON", &Type_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"toJSON", &Type_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"toString", &Type_callAsFunction_toString, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
- {"unsigned", &Type_callAsFunction_unsigned, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{NULL, NULL, 0}
};
-static JSObjectRef (*JSObjectMakeArray$)(JSContextRef, size_t, const JSValueRef[], JSValueRef *);
-
_visible void CYSetArgs(int argc, const char *argv[]) {
JSContextRef context(CYGetJSContext());
JSValueRef args[argc];
for (int i(0); i != argc; ++i)
args[i] = CYCastJSValue(context, argv[i]);
- JSObjectRef array;
- if (JSObjectMakeArray$ != NULL)
- array = _jsccall(*JSObjectMakeArray$, context, argc, args);
- else {
- JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array")));
- JSValueRef value(CYCallAsFunction(context, Array, NULL, argc, args));
- array = CYCastJSObject(context, value);
- }
-
+ JSObjectRef array(CYObjectMakeArray(context, argc, args));
JSObjectRef System(CYGetCachedObject(context, CYJSString("System")));
CYSetProperty(context, System, CYJSString("args"), array);
}
definition = kJSClassDefinitionEmpty;
definition.className = "All";
+ definition.staticFunctions = All_staticFunctions;
definition.hasProperty = &All_hasProperty;
definition.getProperty = &All_getProperty;
definition.getPropertyNames = &All_getPropertyNames;
definition.finalize = &CYFinalize;
Context_ = JSClassCreate(&definition);
+ definition = kJSClassDefinitionEmpty;
+ definition.className = "CArray";
+ definition.staticFunctions = CArray_staticFunctions;
+ definition.staticValues = CArray_staticValues;
+ definition.getProperty = &CArray_getProperty;
+ definition.setProperty = &CArray_setProperty;
+ definition.finalize = &CYFinalize;
+ CArray_ = JSClassCreate(&definition);
+
definition = kJSClassDefinitionEmpty;
definition.className = "CString";
definition.staticFunctions = CString_staticFunctions;
definition = kJSClassDefinitionEmpty;
definition.className = "Struct";
definition.staticFunctions = Struct_staticFunctions;
+ definition.staticValues = Struct_staticValues;
definition.getProperty = &Struct_getProperty;
definition.setProperty = &Struct_setProperty;
definition.getPropertyNames = &Struct_getPropertyNames;
Array_s = JSStringCreateWithUTF8CString("Array");
cy_s = JSStringCreateWithUTF8CString("$cy");
cyi_s = JSStringCreateWithUTF8CString("$cyi");
+ cyt_s = JSStringCreateWithUTF8CString("$cyt");
length_s = JSStringCreateWithUTF8CString("length");
message_s = JSStringCreateWithUTF8CString("message");
name_s = JSStringCreateWithUTF8CString("name");
_assert(slash != NULL);
*slash = '\0';
+ slash = strrchr(lib, '/');
+ if (slash != NULL && strcmp(slash, "/.libs") == 0)
+ *slash = '\0';
+
return lib;
}
static bool CYRunScript(JSGlobalContextRef context, const char *path) {
CYPool pool;
- CYUTF8String code(CYPoolFileUTF8String(pool, path));
+ CYUTF8String code(CYPoolFileUTF8String(pool, pool.strcat(CYPoolLibraryPath(pool), path, NULL)));
if (code.data == NULL)
return false;
CYSetProperty(context, cycript, CYJSString("compile"), &Cycript_compile_callAsFunction);
CYSetProperty(context, cycript, CYJSString("gc"), &Cycript_gc_callAsFunction);
+ JSObjectRef CArray(JSObjectMakeConstructor(context, CArray_, &CArray_new));
+ CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, CArray, prototype_s)), Array_prototype);
+ CYSetProperty(context, cycript, CYJSString("CArray"), CArray);
+
JSObjectRef CString(JSObjectMakeConstructor(context, CString_, &CString_new));
CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, CString, prototype_s)), String_prototype);
CYSetProperty(context, cycript, CYJSString("CString"), CString);
JSObjectRef all(JSObjectMake(context, All_, NULL));
CYSetProperty(context, cycript, CYJSString("all"), all);
+ JSObjectRef cache(JSObjectMake(context, NULL, NULL));
+ CYSetProperty(context, cy, CYJSString("cache"), cache);
+ CYSetPrototype(context, cache, all);
+
JSObjectRef alls(_jsccall(JSObjectCallAsConstructor, context, Array, 0, NULL));
CYSetProperty(context, cycript, CYJSString("alls"), alls);
next = JSObjectGetPrototype(context, curr);
}
- CYSetPrototype(context, last, all);
+ CYSetPrototype(context, last, cache);
}
JSObjectRef System(JSObjectMake(context, NULL, NULL));
CYSetProperty(context, cy, CYJSString("System"), System);
- CYSetProperty(context, all, CYJSString("require"), &require_callAsFunction, kJSPropertyAttributeDontEnum);
+ CYSetProperty(context, global, CYJSString("require"), &require_callAsFunction, kJSPropertyAttributeDontEnum);
CYSetProperty(context, global, CYJSString("system"), System);
CYSetProperty(context, System, CYJSString("args"), CYJSNull(context));
}
#endif
- CYSetProperty(context, global, CYJSString("dlerror"), CYMakeFunctor(context, "dlerror", "*"), kJSPropertyAttributeDontEnum);
- CYSetProperty(context, global, CYJSString("RTLD_DEFAULT"), CYCastJSValue(context, reinterpret_cast<intptr_t>(RTLD_DEFAULT)), kJSPropertyAttributeDontEnum);
- CYSetProperty(context, global, CYJSString("dlsym"), CYMakeFunctor(context, "dlsym", "^v^v*"), kJSPropertyAttributeDontEnum);
+ CYSetProperty(context, String_prototype, cyt_s, CYMakeType(context, sig::String()), 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("dlsym"), CYMakeFunctor(context, "dlsym", "^v^v*"), kJSPropertyAttributeDontEnum);
+
+ CYSetProperty(context, cache, CYJSString("NULL"), CYJSNull(context), kJSPropertyAttributeDontEnum);
- CYSetProperty(context, global, CYJSString("NULL"), CYJSNull(context), kJSPropertyAttributeDontEnum);
+ CYSetProperty(context, cache, CYJSString("bool"), CYMakeType(context, sig::Primitive<bool>()), kJSPropertyAttributeDontEnum);
+ CYSetProperty(context, cache, CYJSString("char"), CYMakeType(context, sig::Primitive<char>()), kJSPropertyAttributeDontEnum);
+ CYSetProperty(context, cache, CYJSString("schar"), CYMakeType(context, sig::Primitive<signed char>()), kJSPropertyAttributeDontEnum);
+ CYSetProperty(context, cache, CYJSString("uchar"), CYMakeType(context, sig::Primitive<unsigned char>()), kJSPropertyAttributeDontEnum);
- CYSetProperty(context, global, CYJSString("bool"), CYMakeType(context, "B"), kJSPropertyAttributeDontEnum);
- CYSetProperty(context, global, CYJSString("char"), CYMakeType(context, "c"), kJSPropertyAttributeDontEnum);
- CYSetProperty(context, global, CYJSString("short"), CYMakeType(context, "s"), kJSPropertyAttributeDontEnum);
- CYSetProperty(context, global, CYJSString("int"), CYMakeType(context, "i"), kJSPropertyAttributeDontEnum);
- CYSetProperty(context, global, CYJSString("long"), CYMakeType(context, "l"), kJSPropertyAttributeDontEnum);
- CYSetProperty(context, global, CYJSString("float"), CYMakeType(context, "f"), kJSPropertyAttributeDontEnum);
- CYSetProperty(context, global, CYJSString("double"), CYMakeType(context, "d"), kJSPropertyAttributeDontEnum);
+ CYSetProperty(context, cache, CYJSString("short"), CYMakeType(context, sig::Primitive<short>()), kJSPropertyAttributeDontEnum);
+ CYSetProperty(context, cache, CYJSString("int"), CYMakeType(context, sig::Primitive<int>()), kJSPropertyAttributeDontEnum);
+ CYSetProperty(context, cache, CYJSString("long"), CYMakeType(context, sig::Primitive<long>()), kJSPropertyAttributeDontEnum);
+ CYSetProperty(context, cache, CYJSString("longlong"), CYMakeType(context, sig::Primitive<long long>()), kJSPropertyAttributeDontEnum);
- CYRunScript(context, "libcycript.cy");
+ CYSetProperty(context, cache, CYJSString("ushort"), CYMakeType(context, sig::Primitive<unsigned short>()), kJSPropertyAttributeDontEnum);
+ CYSetProperty(context, cache, CYJSString("uint"), CYMakeType(context, sig::Primitive<unsigned int>()), 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);
+
+ CYSetProperty(context, cache, CYJSString("float"), CYMakeType(context, sig::Primitive<float>()), kJSPropertyAttributeDontEnum);
+ CYSetProperty(context, cache, CYJSString("double"), CYMakeType(context, sig::Primitive<double>()), kJSPropertyAttributeDontEnum);
for (CYHook *hook : GetHooks())
if (hook->SetupContext != NULL)
(*hook->SetupContext)(context);
CYArrayPush(context, alls, cycript);
+
+ CYRunScript(context, "/libcycript.cy");
}
static JSGlobalContextRef context_;
projects / cycript.git / blobdiff