#define _GNU_SOURCE
#include <substrate.h>
-#include "Struct.hpp"
+#include "cycript.hpp"
#include "sig/parse.hpp"
#include "sig/ffi_type.hpp"
-#include <apr-1/apr_pools.h>
-#include <apr-1/apr_strings.h>
+#include "Pooling.hpp"
+#include "Struct.hpp"
#include <unistd.h>
#include <CoreFoundation/CFLogUtilities.h>
#include <CFNetwork/CFNetwork.h>
-#include <Foundation/Foundation.h>
-
-#include <JavaScriptCore/JSBase.h>
-#include <JavaScriptCore/JSValueRef.h>
-#include <JavaScriptCore/JSObjectRef.h>
-#include <JavaScriptCore/JSContextRef.h>
-#include <JavaScriptCore/JSStringRef.h>
-#include <JavaScriptCore/JSStringRefCF.h>
#include <WebKit/WebScriptObject.h>
#include <map>
#include "Parser.hpp"
+#include "Cycript.tab.hh"
#undef _assert
#undef _trace
CFLog(kCFLogLevelNotice, CFSTR("_trace():%u"), __LINE__); \
} while (false)
-/* APR Pool Helpers {{{ */
-void *operator new(size_t size, apr_pool_t *pool) {
- return apr_palloc(pool, size);
-}
-
-void *operator new [](size_t size, apr_pool_t *pool) {
- return apr_palloc(pool, size);
-}
-
-class CYPool {
- private:
- apr_pool_t *pool_;
-
- public:
- CYPool() {
- apr_pool_create(&pool_, NULL);
- }
-
- ~CYPool() {
- apr_pool_destroy(pool_);
- }
-
- operator apr_pool_t *() const {
- return pool_;
- }
-
- char *operator ()(const char *data) const {
- return apr_pstrdup(pool_, data);
- }
-
- char *operator ()(const char *data, size_t size) const {
- return apr_pstrndup(pool_, data, size);
- }
-};
-/* }}} */
-
-#define _pooled _H<NSAutoreleasePool> _pool([[NSAutoreleasePool alloc] init], true);
static JSContextRef Context_;
@end
@interface NSObject (Cycript)
+- (bool) cy$isUndefined;
- (NSString *) cy$toJSON;
- (JSValueRef) cy$JSValueInContext:(JSContextRef)context;
@end
@implementation NSObject (Cycript)
+- (bool) cy$isUndefined {
+ return false;
+}
+
- (NSString *) cy$toJSON {
return [self description];
}
@implementation WebUndefined (Cycript)
+- (bool) cy$isUndefined {
+ return true;
+}
+
- (NSString *) cy$toJSON {
return @"undefined";
}
[json appendString:@","];
else
comma = true;
- [json appendString:[object cy$toJSON]];
+ if (![object cy$isUndefined])
+ [json appendString:[object cy$toJSON]];
+ else {
+ [json appendString:@","];
+ comma = false;
+ }
}
[json appendString:@"]"];
- (NSString *) cy$toJSON {
NSMutableString *json([[[NSMutableString alloc] init] autorelease]);
- [json appendString:@"("];
- [json appendString:@"{"];
+ [json appendString:@"({"];
bool comma(false);
for (id key in self) {
@end
-JSContextRef JSGetContext() {
+JSContextRef CYGetJSContext() {
return Context_;
}
}
// XXX: this is not a safe handle
-class CYString {
+class CYJSString {
private:
JSStringRef string_;
public:
template <typename Arg0_>
- CYString(Arg0_ arg0) {
+ CYJSString(Arg0_ arg0) {
string_ = CYCopyJSString(arg0);
}
template <typename Arg0_, typename Arg1_>
- CYString(Arg0_ arg0, Arg1_ arg1) {
+ CYJSString(Arg0_ arg0, Arg1_ arg1) {
string_ = CYCopyJSString(arg0, arg1);
}
- ~CYString() {
+ ~CYJSString() {
JSStringRelease(string_);
}
}
CFStringRef CYCopyCFString(JSContextRef context, JSValueRef value) {
- return CYCopyCFString(CYString(context, value));
+ return CYCopyCFString(CYJSString(context, value));
}
double CYCastDouble(JSContextRef context, JSValueRef value) {
- (id) objectForKey:(id)key {
JSValueRef exception(NULL);
- JSValueRef value(JSObjectGetProperty(context_, object_, CYString(key), &exception));
+ JSValueRef value(JSObjectGetProperty(context_, object_, CYJSString(key), &exception));
CYThrow(context_, exception);
return CYCastNSObject(context_, value);
}
- (void) setObject:(id)object forKey:(id)key {
JSValueRef exception(NULL);
- JSObjectSetProperty(context_, object_, CYString(key), CYCastJSValue(context_, object), kJSPropertyAttributeNone, &exception);
+ JSObjectSetProperty(context_, object_, CYJSString(key), CYCastJSValue(context_, object), kJSPropertyAttributeNone, &exception);
CYThrow(context_, exception);
}
- (void) removeObjectForKey:(id)key {
JSValueRef exception(NULL);
// XXX: this returns a bool... throw exception, or ignore?
- JSObjectDeleteProperty(context_, object_, CYString(key), &exception);
+ JSObjectDeleteProperty(context_, object_, CYJSString(key), &exception);
CYThrow(context_, exception);
}
@end
-CFStringRef JSValueToJSONCopy(JSContextRef context, JSValueRef value) {
+CFStringRef CYCopyJSONString(JSContextRef context, JSValueRef value) {
id object(CYCastNSObject(context, value));
return reinterpret_cast<CFStringRef>([(object == nil ? @"null" : [object cy$toJSON]) retain]);
}
JSStringRef script(JSStringCreateWithCFString(code));
CFRelease(code);
- JSValueRef result(JSEvaluateScript(JSGetContext(), script, NULL, NULL, 0, NULL));
+ JSValueRef result(JSEvaluateScript(CYGetJSContext(), script, NULL, NULL, 0, NULL));
JSStringRelease(script);
CFHTTPMessageRef response(CFHTTPMessageCreateResponse(kCFAllocatorDefault, 200, NULL, kCFHTTPVersion1_1));
CFHTTPMessageSetHeaderFieldValue(response, CFSTR("Content-Type"), CFSTR("application/json; charset=utf-8"));
- CFStringRef json(JSValueToJSONCopy(JSGetContext(), result));
+ CFStringRef json(CYCopyJSONString(CYGetJSContext(), result));
CFDataRef body(CFStringCreateExternalRepresentation(kCFAllocatorDefault, json, kCFStringEncodingUTF8, NULL));
CFRelease(json);
void CYSetProperty(JSContextRef context, JSObjectRef object, const char *name, JSValueRef value) {
JSValueRef exception(NULL);
- JSObjectSetProperty(context, object, CYString(name), value, kJSPropertyAttributeNone, &exception);
+ JSObjectSetProperty(context, object, CYJSString(name), value, kJSPropertyAttributeNone, &exception);
CYThrow(context, exception);
}
}
char *CYPoolCString(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
- return CYPoolCString(pool, CYString(context, value));
+ return CYPoolCString(pool, CYJSString(context, value));
}
// XXX: this macro is unhygenic
case sig::string_P: {
if (char *utf8 = *reinterpret_cast<char **>(data))
- value = JSValueMakeString(context, CYString(utf8));
+ value = JSValueMakeString(context, CYJSString(utf8));
else goto null;
} break;
if (NSMutableArray *entry = [Bridge_ objectForKey:name])
switch ([[entry objectAtIndex:0] intValue]) {
case 0:
- return JSEvaluateScript(JSGetContext(), CYString([entry objectAtIndex:1]), NULL, NULL, 0, NULL);
+ return JSEvaluateScript(CYGetJSContext(), CYJSString([entry objectAtIndex:1]), NULL, NULL, 0, NULL);
case 1:
return CYMakeFunction(context, [name cy$symbol], [[entry objectAtIndex:1] UTF8String]);
case 2:
{NULL, NULL, NULL, 0}
};
-void cyparse(CYParser *parser);
-extern int cydebug;
+CYDriver::CYDriver(const std::string &filename) :
+ state_(CYClear),
+ data_(NULL),
+ size_(0),
+ filename_(filename),
+ source_(NULL)
+{
+ ScannerInit();
+}
+
+CYDriver::~CYDriver() {
+ ScannerDestroy();
+}
-void CYConsole(FILE *fin, FILE *fout, FILE *ferr) {
- cydebug = 1;
- CYParser parser;
- cyparse(&parser);
+void cy::parser::error(const cy::parser::location_type &location, const std::string &message) {
+ CYDriver::Error error;
+ error.location_ = location;
+ error.message_ = message;
+ driver.errors_.push_back(error);
}
MSInitialize { _pooled
CYSetProperty(context, global, "ffi", JSObjectMakeConstructor(context, Functor_, &ffi));
- CYSetProperty(context, global, "objc_msgSend", JSObjectMakeFunctionWithCallback(context, CYString("objc_msgSend"), &$objc_msgSend));
+ CYSetProperty(context, global, "objc_msgSend", JSObjectMakeFunctionWithCallback(context, CYJSString("objc_msgSend"), &$objc_msgSend));
Bridge_ = [[NSMutableDictionary dictionaryWithContentsOfFile:@"/usr/lib/libcycript.plist"] retain];
length_ = JSStringCreateWithUTF8CString("length");
JSValueRef exception(NULL);
- JSValueRef value(JSObjectGetProperty(JSGetContext(), global, CYString("Array"), &exception));
+ JSValueRef value(JSObjectGetProperty(CYGetJSContext(), global, CYJSString("Array"), &exception));
CYThrow(context, exception);
- Array_ = JSValueToObject(JSGetContext(), value, &exception);
+ Array_ = JSValueToObject(CYGetJSContext(), value, &exception);
CYThrow(context, exception);
}
projects / cycript.git / blobdiff