JSObjectRef CYObjectMakeArray(JSContextRef context, size_t length, const JSValueRef values[]) {
if (JSObjectMakeArray$ != NULL)
return _jsccall(*JSObjectMakeArray$, context, length, values);
- else {
- JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array")));
- JSValueRef value(CYCallAsFunction(context, Array, NULL, length, values));
- return CYCastJSObject(context, value);
- }
+ JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array")));
+ bool wat(length == 1 && JSValueGetType(context, values[0]) == kJSTypeNumber);
+ JSValueRef value(CYCallAsFunction(context, Array, NULL, wat ? 0 : length, values));
+ JSObjectRef object(CYCastJSObject(context, value));
+ if (wat) CYArrayPush(context, object, 1, values);
+ return object;
}
static JSClassRef All_;
-JSClassRef Functor_;
+JSClassRef cy::Functor::Class_;
static JSClassRef Global_;
JSStringRef Array_s;
type_(new(*pool_) Type_privateData(type, ffi)),
length_(length)
{
- if (owner == NULL) {
- size_t size(ffi->size * length);
- void *copy(pool_->malloc<void>(size, ffi->alignment));
- memcpy(copy, value_, size);
- value_ = copy;
- }
}
};
value_(value),
owner_(context, owner)
{
- if (owner == NULL)
- value_ = pool_->strdup(value_);
}
};
return JSValueMakeNumber(context, static_cast<double>(value)); \
}
+CYCastJSValue_(long double)
CYCastJSValue_(signed short int)
CYCastJSValue_(unsigned short int)
CYCastJSValue_(signed int)
case kJSTypeString: {
std::ostringstream str;
CYUTF8String string(CYPoolUTF8String(pool, context, CYJSString(context, value)));
- CYStringify(str, string.data, string.size);
+ CYStringify(str, string.data, string.size, CYStringifyModeCycript);
std::string value(str.str());
return pool.strmemdup(value.c_str(), value.size());
} break;
if (CYIsKey(string))
str << string.data;
else
- CYStringify(str, string.data, string.size);
+ CYStringify(str, string.data, string.size, CYStringifyModeLegacy);
str << ':';
std::ostringstream str;
CYUTF8String string(CYPoolUTF8String(pool, context, CYJSString(context, _this)));
- CYStringify(str, string.data, string.size);
+ CYStringify(str, string.data, string.size, CYStringifyModeCycript);
std::string value(str.str());
return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size())));
static JSValueRef CYMakeFunctor(JSContextRef context, void (*function)(), bool variadic, const sig::Signature &signature) {
if (function == NULL)
return CYJSNull(context);
- return JSObjectMake(context, Functor_, new cy::Functor(function, variadic, signature));
+ return JSObjectMake(context, cy::Functor::Class_, new cy::Functor(function, variadic, signature));
}
// XXX: remove this, as it is really stupid
cy::Functor *internal(new cy::Functor(function, encoding));
++internal->count_;
- return JSObjectMake(context, Functor_, internal);
+ return JSObjectMake(context, cy::Functor::Class_, internal);
}
bool CYGetOffset(CYPool &pool, JSContextRef context, JSStringRef value, ssize_t &index) {
*reinterpret_cast<Type_ *>(data) = CYCastDouble(context, value); \
}
-CYPoolFFI_(char)
-CYPoolFFI_(double)
+CYPoolFFI_(wchar_t)
CYPoolFFI_(float)
+CYPoolFFI_(double)
+CYPoolFFI_(long double)
+
CYPoolFFI_(signed char)
CYPoolFFI_(signed int)
CYPoolFFI_(signed long int)
CYPoolFFI_(signed long long int)
CYPoolFFI_(signed short int)
+
CYPoolFFI_(unsigned char)
CYPoolFFI_(unsigned int)
CYPoolFFI_(unsigned long int)
CYPoolFFI_(unsigned __int128)
#endif
+template <>
+void Primitive<char>::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+ if (JSValueGetType(context, value) != kJSTypeString)
+ *reinterpret_cast<char *>(data) = CYCastDouble(context, value);
+ else {
+ CYJSString script(context, value);
+ auto string(CYCastUTF16String(script));
+ _assert(string.size == 1);
+ *reinterpret_cast<char *>(data) = string.data[0];
+ }
+}
+
void Void::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
_assert(false);
}
}
CYFromFFI_(bool)
-CYFromFFI_(char)
-CYFromFFI_(double)
+CYFromFFI_(wchar_t)
CYFromFFI_(float)
+CYFromFFI_(double)
+CYFromFFI_(long double)
+
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 __int128)
#endif
+template <>
+JSValueRef Primitive<char>::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+ uint16_t string(uint8_t(*reinterpret_cast<char *>(data)));
+ JSValueRef value(CYCastJSValue(context, CYJSString(CYUTF16String(&string, 1))));
+ JSObjectRef typed(_jsccall(JSObjectCallAsConstructor, context, CYGetCachedObject(context, CYJSString("String")), 1, &value));
+ CYSetProperty(context, typed, cyt_s, CYMakeType(context, sig::Primitive<char>()), kJSPropertyAttributeDontEnum);
+ CYSetPrototype(context, typed, CYGetCachedValue(context, CYJSString("Character_prototype")));
+ return typed;
+}
+
JSValueRef Void::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
return CYJSUndefined(context);
}
static JSObjectRef CYMakeFunctor(JSContextRef context, JSObjectRef function, const sig::Signature &signature) {
Closure_privateData *internal(CYMakeFunctor_(context, function, signature, &FunctionAdapter_));
- JSObjectRef object(JSObjectMake(context, Functor_, internal));
+ JSObjectRef object(JSObjectMake(context, cy::Functor::Class_, internal));
// XXX: see above notes about needing to leak
JSValueProtect(CYGetJSContext(context), object);
return object;
else if (!CYGetOffset(pool, context, property, offset))
return NULL;
- return CYCastJSValue(context, CYJSString(CYUTF8String(&internal->value_[offset], 1)));
+ sig::Primitive<char> type;
+ return type.FromFFI(context, type.GetFFI(pool), internal->value_ + offset, false, NULL);
} CYCatch(NULL) }
static bool CString_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
else if (!CYGetOffset(pool, context, property, offset))
return false;
- const char *data(CYPoolCString(pool, context, value));
- internal->value_[offset] = *data;
+ sig::Primitive<char> type;
+ type.PoolFFI(NULL, context, type.GetFFI(pool), internal->value_ + offset, value);
return true;
} CYCatch(false) }
element.type->PoolFFI(&pool, context, ffi, values[index], arguments[index - setups]);
}
- uint8_t *value(pool.malloc<uint8_t>(std::max<size_t>(cif->rtype->size, sizeof(ffi_arg)), std::max<size_t>(cif->rtype->alignment, alignof(ffi_arg))));
+ CYBuffer buffer(context);
+ uint8_t *value(buffer->malloc<uint8_t>(std::max<size_t>(cif->rtype->size, sizeof(ffi_arg)), std::max<size_t>(cif->rtype->alignment, alignof(ffi_arg))));
void (*call)(CYPool &, JSContextRef, ffi_cif *, void (*)(), void *, void **) = &CYCallFunction;
// XXX: this only supports one hook, but it is a bad idea anyway
call = hook->CallFunction;
call(pool, context, cif, function, value, values);
- return signature.elements[0].type->FromFFI(context, cif->rtype, value, initialize);
+ return signature.elements[0].type->FromFFI(context, cif->rtype, value, initialize, buffer);
}
static JSValueRef Functor_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
static JSObjectRef CArray_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
_assert(false);
-} CYCatch(NULL) }
+} CYCatchObject() }
static JSObjectRef CString_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
_assert(false);
-} CYCatch(NULL) }
+} CYCatchObject() }
static JSObjectRef Pointer_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
_assert(false);
-} CYCatch(NULL) }
+} CYCatchObject() }
static JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
CYPool pool;
} else {
throw CYJSError(context, "incorrect number of arguments to Type constructor");
}
-} CYCatch(NULL) }
+} CYCatchObject() }
static JSValueRef Type_callAsFunction_$With(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], sig::Callable &type, JSValueRef *exception) { CYTry {
Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
if (sig::Function *function = dynamic_cast<sig::Function *>(internal->type_))
return CYMakeFunctor(context, arguments[0], function->variadic, function->signature);
- CYPool pool;
+ CYBuffer buffer(context);
sig::Type *type(internal->type_);
ffi_type *ffi(internal->GetFFI());
- void *data(pool.malloc<void>(ffi->size, ffi->alignment));
- type->PoolFFI(&pool, context, ffi, data, arguments[0]);
- JSValueRef value(type->FromFFI(context, ffi, data));
+ void *data;
+ if (_this == NULL || CYIsStrictEqual(context, _this, CYGetGlobalObject(context)))
+ data = buffer->malloc<void>(ffi->size, ffi->alignment);
+ else {
+ CYSetProperty(context, buffer, CYJSString("$cyo"), _this, kJSPropertyAttributeDontEnum);
+ data = CYCastPointer<void *>(context, _this);
+ }
+
+ type->PoolFFI(buffer, context, ffi, data, arguments[0]);
+ JSValueRef value(type->FromFFI(context, ffi, data, false, buffer));
if (JSValueGetType(context, value) == kJSTypeNumber) {
JSObjectRef typed(_jsccall(JSObjectCallAsConstructor, context, CYGetCachedObject(context, CYJSString("Number")), 1, &value));
type->PoolFFI(value->pool_, context, ffi, value->value_, arguments[0]);
return pointer;
-} CYCatch(NULL) }
+} CYCatchObject() }
// XXX: I don't even think the user should be allowed to do this
static JSObjectRef Functor_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
sig::Parse(pool, &signature, encoding, &Structor_);
// XXX: this can try to return null, and I guess then it just fails
return CYCastJSObject(context, CYMakeFunctor(context, arguments[0], false, signature));
-} CYCatch(NULL) }
+} CYCatchObject() }
static JSValueRef CArray_callAsFunction_toPointer(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
CArray *internal(reinterpret_cast<CArray *>(JSObjectGetPrivate(_this)));
sig::Function function(internal->variadic_);
sig::Copy(pool, function.signature, internal->signature_);
- CYPropertyName *name;
-
- auto typed(CYDecodeType(pool, &function)); {
- std::ostringstream str;
- Dl_info info;
- if (dladdr(value, &info) == 0) {
- str << (void *) value;
- name = new(pool) CYNumber(reinterpret_cast<uintptr_t>(value));
- } else {
- str << info.dli_sname;
- off_t offset(value - reinterpret_cast<uint8_t *>(info.dli_saddr));
- if (offset != 0)
- str << "+0x" << std::hex << offset;
- name = new(pool) CYString(pool.strdup(str.str().c_str()));
- }
- }
+ CYPropertyName *name(internal->GetName(pool));
+ auto typed(CYDecodeType(pool, &function));
std::ostringstream str;
CYOptions options;
return CYCastJSValue(context, CYJSString(str.str()));
} CYCatch(NULL) }
+CYPropertyName *cy::Functor::GetName(CYPool &pool) const {
+ Dl_info info;
+ if (dladdr(reinterpret_cast<void *>(value_), &info) == 0 || strcmp(info.dli_sname, "<redacted>") == 0)
+ return new(pool) CYNumber(reinterpret_cast<uintptr_t>(value_));
+
+ std::ostringstream str;
+ str << info.dli_sname;
+ off_t offset(reinterpret_cast<uint8_t *>(value_) - reinterpret_cast<uint8_t *>(info.dli_saddr));
+ if (offset != 0)
+ str << "+0x" << std::hex << offset;
+ return new(pool) CYString(pool.strdup(str.str().c_str()));
+}
+
static JSValueRef Pointer_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
std::set<void *> *objects(CYCastObjects(context, _this, count, arguments));
str << "NULL";
else {
str << "&";
- CYStringify(str, string, strlen(string), true);
+ CYStringify(str, string, strlen(string), CYStringifyModeNative);
}
std::string value(str.str());
return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size())));
{NULL, NULL, 0}
};
-namespace cy {
- JSStaticFunction const * const Functor::StaticFunctions = Functor_staticFunctions;
-}
-
static JSStaticValue Functor_staticValues[2] = {
{"$cyt", &Functor_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{NULL, NULL, NULL, 0}
};
-namespace cy {
- JSStaticValue const * const Functor::StaticValues = Functor_staticValues;
-}
-
static JSStaticValue Type_staticValues[4] = {
{"alignment", &Type_getProperty_alignment, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"name", &Type_getProperty_name, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
definition = kJSClassDefinitionEmpty;
definition.className = "Functor";
- definition.staticFunctions = cy::Functor::StaticFunctions;
+ definition.staticFunctions = Functor_staticFunctions;
definition.staticValues = Functor_staticValues;
definition.callAsFunction = &Functor_callAsFunction;
definition.finalize = &CYFinalize;
- Functor_ = JSClassCreate(&definition);
+ cy::Functor::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.className = "Pointer";
definition.finalize = &CYFinalize;
CYPrivate<Pointer>::Class_ = JSClassCreate(&definition);
+ definition = kJSClassDefinitionEmpty;
+ definition.className = "Root";
+ definition.finalize = &CYFinalize;
+ CYPrivate<CYRoot>::Class_ = JSClassCreate(&definition);
+
definition = kJSClassDefinitionEmpty;
definition.className = "Struct";
definition.staticFunctions = Struct_staticFunctions;
CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, CString, prototype_s)), String_prototype);
CYSetProperty(context, cycript, CYJSString("CString"), CString);
- JSObjectRef Functor(JSObjectMakeConstructor(context, Functor_, &Functor_new));
- CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Functor, prototype_s)), Function_prototype);
+ JSObjectRef Functor(JSObjectMakeConstructor(context, cy::Functor::Class_, &Functor_new));
+ JSObjectRef Functor_prototype(CYCastJSObject(context, CYGetProperty(context, Functor, prototype_s)));
+ CYSetPrototype(context, Functor_prototype, Function_prototype);
+ CYSetProperty(context, cy, CYJSString("Functor_prototype"), Functor_prototype);
CYSetProperty(context, cycript, CYJSString("Functor"), Functor);
CYSetProperty(context, cycript, CYJSString("Pointer"), JSObjectMakeConstructor(context, CYPrivate<Pointer>::Class_, &Pointer_new));
- CYSetProperty(context, cycript, CYJSString("Type"), JSObjectMakeConstructor(context, CYPrivate<Type_privateData>::Class_, &Type_new));
+
+ JSObjectRef Type(JSObjectMakeConstructor(context, CYPrivate<Type_privateData>::Class_, &Type_new));
+ JSObjectRef Type_prototype(CYCastJSObject(context, CYGetProperty(context, Type, prototype_s)));
+ CYSetPrototype(context, Type_prototype, Function_prototype);
+ CYSetProperty(context, cy, CYJSString("Type_prototype"), Type_prototype);
+ CYSetProperty(context, cycript, CYJSString("Type"), Type);
+
+ JSObjectRef Character_prototype(JSObjectMake(context, NULL, NULL));
+ CYSetPrototype(context, Character_prototype, String_prototype);
+ CYSetProperty(context, cy, CYJSString("Character_prototype"), Character_prototype);
+ CYSetProperty(context, Character_prototype, CYJSString("valueOf"), _jsccall(JSEvaluateScript, context, CYJSString("(function(){return this.charCodeAt(0);})"), NULL, NULL, 0));
JSObjectRef modules(JSObjectMake(context, NULL, NULL));
CYSetProperty(context, cy, CYJSString("modules"), modules);
CYSetProperty(context, cache, CYJSString("float"), CYMakeType(context, sig::Primitive<float>()), kJSPropertyAttributeDontEnum);
CYSetProperty(context, cache, CYJSString("double"), CYMakeType(context, sig::Primitive<double>()), kJSPropertyAttributeDontEnum);
+ CYSetProperty(context, cache, CYJSString("longdouble"), CYMakeType(context, sig::Primitive<long double>()), kJSPropertyAttributeDontEnum);
CYSetProperty(context, global, CYJSString("require"), &require_callAsFunction, kJSPropertyAttributeDontEnum);
projects / cycript.git / blobdiff