return iconv(cd, const_cast<Type_>(inbuf), inbytesleft, outbuf, outbytesleft);
}
-static CYUTF8String CYPoolUTF8String(apr_pool_t *pool, JSContextRef context, JSStringRef value) {
+CYUTF8String CYPoolUTF8String(apr_pool_t *pool, JSContextRef context, JSStringRef value) {
_assert(pool != NULL);
CYUTF16String utf16(CYCastUTF16String(value));
/* Index Offsets {{{ */
size_t CYGetIndex(const CYUTF8String &value) {
if (value.data[0] != '0') {
- char *end;
- size_t index(strtoul(value.data, &end, 10));
- if (value.data + value.size == end)
- return index;
- } else if (value.data[1] == '\0')
+ size_t index(0);
+ for (size_t i(0); i != value.size; ++i) {
+ if (!DigitRange_[value.data[i]])
+ return _not(size_t);
+ index *= 10;
+ index += value.data[i] - '0';
+ }
+ return index;
+ } else if (value.size == 1)
return 0;
- return _not(size_t);
+ else
+ return _not(size_t);
}
size_t CYGetIndex(apr_pool_t *pool, JSContextRef context, JSStringRef value) {
return CYGetIndex(CYPoolUTF8String(pool, context, value));
}
+// XXX: this isn't actually right
bool CYGetOffset(const char *value, ssize_t &index) {
if (value[0] != '0') {
char *end;
}
};
-void Structor_(apr_pool_t *pool, const char *name, const char *types, sig::Type *&type) {
- if (name == NULL)
+void Structor_(apr_pool_t *pool, sig::Type *&type) {
+ if (
+ type->primitive == sig::pointer_P &&
+ type->data.data.type != NULL &&
+ type->data.data.type->primitive == sig::struct_P &&
+ 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;
sqlite3_stmt *statement;
" limit 1"
, -1, &statement, NULL));
- _sqlcall(sqlite3_bind_text(statement, 1, name, -1, SQLITE_STATIC));
+ _sqlcall(sqlite3_bind_text(statement, 1, type->name, -1, SQLITE_STATIC));
int mode;
const char *value;
CYOwned
{
Type_privateData *type_;
+ size_t length_;
- Pointer(void *value, JSContextRef context, JSObjectRef owner, sig::Type *type) :
+ Pointer(void *value, JSContextRef context, JSObjectRef owner, size_t length, sig::Type *type) :
CYOwned(value, context, owner),
- type_(new(pool_) Type_privateData(type))
+ type_(new(pool_) Type_privateData(type)),
+ length_(length)
{
}
};
static JSValueRef $cyq(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
CYPool pool;
- const char *name(apr_psprintf(pool, "%s%zu", CYPoolCString(pool, context, arguments[0]), Nonce_++));
+ const char *name(apr_psprintf(pool, "%s%"APR_SIZE_T_FMT"", CYPoolCString(pool, context, arguments[0]), Nonce_++));
return CYCastJSValue(context, name);
}
return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size())));
} CYCatch }
-JSObjectRef CYMakePointer(JSContextRef context, void *pointer, sig::Type *type, ffi_type *ffi, JSObjectRef owner) {
- Pointer *internal(new Pointer(pointer, context, owner, type));
+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));
return JSObjectMake(context, Pointer_, internal);
}
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;
+
case sig::pointer_P:
*reinterpret_cast<void **>(data) = CYCastPointer<void *>(context, value);
break;
if ((*hooks_->PoolFFI)(pool, context, type, ffi, data, value))
return;
- fprintf(stderr, "CYPoolFFI(%c)\n", type->primitive);
- _assert(false);
+ CYThrow("unimplemented signature code: '%c''\n", type->primitive);
}
}
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, type->data.data.type, ffi, owner);
+ return CYMakePointer(context, pointer, _not(size_t), type->data.data.type, NULL, owner);
else goto null;
case sig::string_P:
if (JSValueRef value = (*hooks_->FromFFI)(context, type, ffi, data, initialize, owner))
return value;
- fprintf(stderr, "CYFromFFI(%c)\n", type->primitive);
- _assert(false);
+ CYThrow("unimplemented signature code: '%c''\n", type->primitive);
}
}
return true;
}
-static JSValueRef Pointer_getIndex(JSContextRef context, JSObjectRef object, size_t index, JSValueRef *exception) { CYTry {
+static JSValueRef Pointer_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+ CYPool pool;
Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
- Type_privateData *typical(internal->type_);
- ffi_type *ffi(typical->GetFFI());
+ if (JSStringIsEqual(property, length_))
+ return internal->length_ == _not(size_t) ? CYJSUndefined(context) : CYCastJSValue(context, internal->length_);
- uint8_t *base(reinterpret_cast<uint8_t *>(internal->value_));
- base += ffi->size * index;
-
- JSObjectRef owner(internal->GetOwner() ?: object);
- return CYFromFFI(context, typical->type_, ffi, base, false, owner);
-} CYCatch }
-
-static JSValueRef Pointer_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
- CYPool pool;
- Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
Type_privateData *typical(internal->type_);
if (typical->type_ == NULL)
return NULL;
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 Pointer_getIndex(context, object, offset, exception);
-}
-
-static JSValueRef Pointer_getProperty_$cyi(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
- return Pointer_getIndex(context, object, 0, exception);
-}
-
-static bool Pointer_setIndex(JSContextRef context, JSObjectRef object, size_t index, JSValueRef value, JSValueRef *exception) { CYTry {
- Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
- Type_privateData *typical(internal->type_);
-
ffi_type *ffi(typical->GetFFI());
uint8_t *base(reinterpret_cast<uint8_t *>(internal->value_));
- base += ffi->size * index;
+ base += ffi->size * offset;
- CYPoolFFI(NULL, context, typical->type_, ffi, base, value);
- return true;
+ JSObjectRef owner(internal->GetOwner() ?: object);
+ return CYFromFFI(context, typical->type_, ffi, base, false, owner);
} CYCatch }
-static bool Pointer_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) {
+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 NULL;
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 Pointer_setIndex(context, object, offset, value, exception);
-}
+ ffi_type *ffi(typical->GetFFI());
-static bool Pointer_setProperty_$cyi(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) {
- return Pointer_setIndex(context, object, 0, value, exception);
-}
+ uint8_t *base(reinterpret_cast<uint8_t *>(internal->value_));
+ base += ffi->size * offset;
+
+ CYPoolFFI(NULL, context, typical->type_, ffi, base, value);
+ return true;
+} CYCatch }
static JSValueRef Struct_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
Struct_privateData *internal(reinterpret_cast<Struct_privateData *>(JSObjectGetPrivate(_this)));
Type_privateData *typical(internal->type_);
- return CYMakePointer(context, internal->value_, typical->type_, typical->ffi_, _this);
+ return CYMakePointer(context, internal->value_, _not(size_t), typical->type_, typical->ffi_, _this);
}
static JSValueRef Struct_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
name = elements[index].name;
if (name == NULL) {
- sprintf(number, "%lu", index);
+ sprintf(number, "%zu", index);
name = number;
}
}
static JSObjectRef CYMakeType(JSContextRef context, const char *type) {
- Type_privateData *internal(new Type_privateData(NULL, type));
+ Type_privateData *internal(new Type_privateData(type));
return JSObjectMake(context, Type_privateData::Class_, internal);
}
case 0:
return JSEvaluateScript(CYGetJSContext(), CYJSString(value), NULL, NULL, 0, NULL);
- case 1:
- return CYMakeFunctor(context, reinterpret_cast<void (*)()>(CYCastSymbol(name.data)), value);
- case 2: {
- // XXX: this is horrendously inefficient
- sig::Signature signature;
- sig::Parse(pool, &signature, value, &Structor_);
- ffi_cif cif;
- sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif);
- return CYFromFFI(context, signature.elements[0].type, cif.rtype, CYCastSymbol(name.data));
- }
+ case 1:
+ if (void (*symbol)() = reinterpret_cast<void (*)()>(CYCastSymbol(name.data)))
+ return CYMakeFunctor(context, symbol, value);
+ else return NULL;
+
+ case 2:
+ if (void *symbol = CYCastSymbol(name.data)) {
+ // XXX: this is horrendously inefficient
+ sig::Signature signature;
+ sig::Parse(pool, &signature, value, &Structor_);
+ ffi_cif cif;
+ sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif);
+ return CYFromFFI(context, signature.elements[0].type, cif.rtype, symbol);
+ } else return NULL;
// XXX: implement case 3
case 4:
sig::Signature signature;
sig::Parse(pool, &signature, type, &Structor_);
- return CYMakePointer(context, value, signature.elements[0].type, NULL, NULL);
+ return CYMakePointer(context, value, _not(size_t), signature.elements[0].type, NULL, NULL);
} CYCatch }
static JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
sig::Type *type(internal->type_);
- size_t size;
+ size_t length;
if (type->primitive != sig::array_P)
- size = 0;
+ length = _not(size_t);
else {
- size = type->data.data.size;
+ length = type->data.data.size;
type = type->data.data.type;
}
void *value(malloc(internal->GetFFI()->size));
- return CYMakePointer(context, value, type, NULL, NULL);
+ return CYMakePointer(context, value, length, type, NULL, NULL);
} CYCatch }
static JSObjectRef Functor_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
}
static JSValueRef CYValue_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
-CYValue *internal(reinterpret_cast<CYValue *>(JSObjectGetPrivate(_this)));
+ CYValue *internal(reinterpret_cast<CYValue *>(JSObjectGetPrivate(_this)));
char string[32];
sprintf(string, "%p", internal->value_);
-
return CYCastJSValue(context, string);
} CYCatch }
+static JSValueRef Pointer_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+ Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(_this)));
+ if (internal->length_ != _not(size_t))
+ // XXX: maybe dynamically look up Array.toCYON?
+ return Array_callAsFunction_toCYON(context, object, _this, count, arguments, exception);
+ else {
+ char string[32];
+ sprintf(string, "%p", internal->value_);
+ return CYCastJSValue(context, string);
+ }
+} CYCatch }
+
static JSValueRef Type_callAsFunction_toString(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;
return Type_callAsFunction_toString(context, object, _this, count, arguments, exception);
}
-static JSStaticValue Pointer_staticValues[2] = {
- {"$cyi", &Pointer_getProperty_$cyi, &Pointer_setProperty_$cyi, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
- {NULL, NULL, NULL, 0}
-};
-
static JSStaticFunction Pointer_staticFunctions[4] = {
- {"toCYON", &CYValue_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {"toCYON", &Pointer_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"toJSON", &CYValue_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"valueOf", &CYValue_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{NULL, NULL, 0}
{NULL, NULL, 0}
};
-static JSObjectRef (*$JSObjectMakeArray)(JSContextRef, size_t, const JSValueRef[], JSValueRef *);
+static JSObjectRef (*JSObjectMakeArray$)(JSContextRef, size_t, const JSValueRef[], JSValueRef *);
void CYSetArgs(int argc, const char *argv[]) {
JSContextRef context(CYGetJSContext());
args[i] = CYCastJSValue(context, argv[i]);
JSObjectRef array;
- if ($JSObjectMakeArray != NULL) {
+ if (JSObjectMakeArray$ != NULL) {
JSValueRef exception(NULL);
- array = (*$JSObjectMakeArray)(context, argc, args, &exception);
+ array = (*JSObjectMakeArray$)(context, argc, args, &exception);
CYThrow(context, exception);
} else {
JSValueRef value(CYCallAsFunction(context, Array_, NULL, argc, args));
_aprcall(apr_pool_create(&Pool_, NULL));
_sqlcall(sqlite3_open("/usr/lib/libcycript.db", &Bridge_));
- $JSObjectMakeArray = reinterpret_cast<JSObjectRef (*)(JSContextRef, size_t, const JSValueRef[], JSValueRef *)>(dlsym(RTLD_DEFAULT, "JSObjectMakeArray"));
+ JSObjectMakeArray$ = reinterpret_cast<JSObjectRef (*)(JSContextRef, size_t, const JSValueRef[], JSValueRef *)>(dlsym(RTLD_DEFAULT, "JSObjectMakeArray"));
}
apr_pool_t *CYGetGlobalPool() {
message_ = apr_pvsprintf(pool_, format, args);
}
+JSValueRef CYCastJSError(JSContextRef context, const char *message) {
+ JSValueRef arguments[1] = {CYCastJSValue(context, message)};
+
+ JSValueRef exception(NULL);
+ JSValueRef value(JSObjectCallAsConstructor(context, Error_, 1, arguments, &exception));
+ CYThrow(context, exception);
+
+ return value;
+}
+
JSValueRef CYPoolError::CastJSValue(JSContextRef context) const {
- return CYCastJSValue(context, message_);
+ return CYCastJSError(context, message_);
}
CYJSError::CYJSError(JSContextRef context, const char *format, ...) {
const char *message(apr_pvsprintf(pool, format, args));
va_end (args);
- JSValueRef arguments[1] = {CYCastJSValue(context, CYJSString(message))};
-
- JSValueRef exception(NULL);
- value_ = JSObjectCallAsConstructor(context, Error_, 1, arguments, &exception);
- CYThrow(context, exception);
+ value_ = CYCastJSError(context, message);
}
-void CYObjectiveC(JSContextRef context, JSObjectRef global);
+JSGlobalContextRef CYGetJSContext(JSContextRef context) {
+ // XXX: do something better
+ return Context_;
+}
JSGlobalContextRef CYGetJSContext() {
CYInitialize();
definition = kJSClassDefinitionEmpty;
definition.className = "Pointer";
- definition.staticValues = Pointer_staticValues;
definition.staticFunctions = Pointer_staticFunctions;
definition.getProperty = &Pointer_getProperty;
definition.setProperty = &Pointer_setProperty;
Result_ = JSStringCreateWithUTF8CString("_");
-// XXX: this is very wrong and sad
-#ifdef __APPLE__
- CYObjectiveC(context, global);
-#endif
+ if (hooks_ != NULL && hooks_->SetupContext != NULL)
+ (*hooks_->SetupContext)(context);
}
return Context_;
projects / cycript.git / blobdiff