Started working on CYApplicationMain replacement, added bridging for some Foundation...

diff --git a/Bridge.def b/Bridge.def
index 40b0d1b08267706b489e622fd97dfed6b9b50475..68251dad50f35ad25c2610389adccc3778e62321 100644 (file)
--- a/Bridge.def
+++ b/Bridge.def
@@ -754,6 +754,47 @@ C kCLErrorHeadingFailure 3
 
 V kCLErrorDomain @
 
 
 V kCLErrorDomain @
 

+f Foundation
+
+S _NSRange "location"I"length"I
+
+C NSMinXEdge 0
+C NSMinYEdge 1
+C NSMaxXEdge 2
+C NSMaxYEdge 3
+
+C NSApplicationDirectory 1
+C NSDemoApplicationDirectory 2
+C NSDeveloperApplicationDirectory 3
+C NSAdminApplicationDirectory 4
+C NSLibraryDirectory 5
+C NSDeveloperDirectory 6
+C NSUserDirectory 7
+C NSDocumentationDirectory 8
+C NSDocumentDirectory 9
+C NSCoreServiceDirectory 10
+C NSAutosavedInformationDirectory 11
+C NSDesktopDirectory 12
+C NSCachesDirectory 13
+C NSApplicationSupportDirectory 14
+C NSDownloadsDirectory 15
+C NSInputMethodsDirectory 16
+C NSMoviesDirectory 17
+C NSMusicDirectory 18
+C NSPicturesDirectory 19
+C NSPrinterDescriptionDirectory 20
+C NSSharedPublicDirectory 21
+C NSPreferencePanesDirectory 22
+C NSItemReplacementDirectory 99
+C NSAllApplicationsDirectory 100
+C NSAllLibrariesDirectory 101
+
+C NSUserDomainMask 1
+C NSLocalDomainMask 2
+C NSNetworkDomainMask 4
+C NSSystemDomainMask 8
+C NSAllDomainsMask 0x0ffff
+

 f MapKit
 
 C MKMapTypeStandard 0
 f MapKit
 
 C MKMapTypeStandard 0

diff --git a/Library.mm b/Library.mm
index 7b254421fddad7cbd70001e8115d69fd59bfae55..0083fb54551b713e1cb45771bebbd950632fa092 100644 (file)
--- a/Library.mm
+++ b/Library.mm
@@ -387,6 +387,24 @@ JSValueRef CYJSUndefined(JSContextRef context) {
     return JSValueMakeUndefined(context);
 }
 
     return JSValueMakeUndefined(context);
 }
 

+size_t CYCastIndex(const char *value) {
+    if (value[0] == '0') {
+        if (value[1] == '\0')
+            return 0;
+    } else {
+        char *end;
+        size_t index(strtoul(value, &end, 10));
+        if (value + strlen(value) == end)
+            return index;
+    }
+
+    return _not(size_t);
+}
+
+size_t CYCastIndex(NSString *value) {
+    return CYCastIndex([value UTF8String]);
+}
+

 @interface NSMethodSignature (Cycript)
 - (NSString *) _typeString;
 @end
 @interface NSMethodSignature (Cycript)
 - (NSString *) _typeString;
 @end


@@ -605,8 +623,8 @@ struct PropertyAttributes {
     if ([name isEqualToString:@"length"])
         return [NSNumber numberWithUnsignedInteger:[self count]];
 
     if ([name isEqualToString:@"length"])
         return [NSNumber numberWithUnsignedInteger:[self count]];
 

-    int index([name intValue]);
-    if (index < 0 || index >= static_cast<int>([self count]))
+    size_t index(CYCastIndex(name));
+    if (index == _not(size_t) || index >= [self count])

         return [super cy$getProperty:name];
     else
         return [self objectAtIndex:index];
         return [super cy$getProperty:name];
     else
         return [self objectAtIndex:index];


@@ -617,8 +635,8 @@ struct PropertyAttributes {
 @implementation NSMutableArray (Cycript)
 
 - (bool) cy$setProperty:(NSString *)name to:(NSObject *)value {
 @implementation NSMutableArray (Cycript)
 
 - (bool) cy$setProperty:(NSString *)name to:(NSObject *)value {

-    int index([name intValue]);
-    if (index < 0 || index >= static_cast<int>([self count]))
+    size_t index(CYCastIndex(name));
+    if (index == _not(size_t) || index >= [self count])

         return [super cy$setProperty:name to:value];
     else {
         [self replaceObjectAtIndex:index withObject:(value ?: [NSNull null])];
         return [super cy$setProperty:name to:value];
     else {
         [self replaceObjectAtIndex:index withObject:(value ?: [NSNull null])];


@@ -627,8 +645,8 @@ struct PropertyAttributes {
 }
 
 - (bool) cy$deleteProperty:(NSString *)name {
 }
 
 - (bool) cy$deleteProperty:(NSString *)name {

-    int index([name intValue]);
-    if (index < 0 || index >= static_cast<int>([self count]))
+    size_t index(CYCastIndex(name));
+    if (index == _not(size_t) || index >= [self count])

         return [super cy$deleteProperty:name];
     else {
         [self removeObjectAtIndex:index];
         return [super cy$deleteProperty:name];
     else {
         [self removeObjectAtIndex:index];


@@ -739,11 +757,20 @@ struct PropertyAttributes {
     const char *value([self UTF8String]);
     size_t size(strlen(value));
 
     const char *value([self UTF8String]);
     size_t size(strlen(value));
 

-    if (size == 0 || !WordStartRange_[value[0]])
+    if (size == 0)

         goto cyon;
         goto cyon;

-    for (size_t i(1); i != size; ++i)
-        if (!WordEndRange_[value[i]])
+
+    if (DigitRange_[value[0]]) {
+        if (CYCastIndex(self) == _not(size_t))

             goto cyon;
             goto cyon;

+    } else {
+        if (!WordStartRange_[value[0]])
+            goto cyon;
+        for (size_t i(1); i != size; ++i)
+            if (!WordEndRange_[value[i]])
+                goto cyon;
+    }
+

     return self;
 
   cyon:
     return self;
 
   cyon:


@@ -786,8 +813,9 @@ struct PropertyAttributes {
 
 @end
 
 
 @end
 

-CYRange WordStartRange_(0x1000000000LLU,0x7fffffe87fffffeLLU); // A-Za-z_$
-CYRange WordEndRange_(0x3ff001000000000LLU,0x7fffffe87fffffeLLU); // A-Za-z_$0-9
+CYRange DigitRange_    (0x3ff000000000000LLU, 0x000000000000000LLU); // 0-9
+CYRange WordStartRange_(0x000001000000000LLU, 0x7fffffe87fffffeLLU); // A-Za-z_$
+CYRange WordEndRange_  (0x3ff001000000000LLU, 0x7fffffe87fffffeLLU); // A-Za-z_$0-9

 
 JSGlobalContextRef CYGetJSContext() {
     return Context_;
 
 JSGlobalContextRef CYGetJSContext() {
     return Context_;


@@ -863,7 +891,8 @@ class CYJSString {
     JSStringRef string_;
 
     void Clear_() {
     JSStringRef string_;
 
     void Clear_() {

-        JSStringRelease(string_);
+        if (string_ != NULL)
+            JSStringRelease(string_);

     }
 
   public:
     }
 
   public:


@@ -1398,8 +1427,11 @@ void CYPoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type
                 else {
                     rhs = CYGetProperty(context, aggregate, index);
                     if (JSValueIsUndefined(context, rhs)) {
                 else {
                     rhs = CYGetProperty(context, aggregate, index);
                     if (JSValueIsUndefined(context, rhs)) {

-                        rhs = CYGetProperty(context, aggregate, CYJSString(element->name));
-                        if (JSValueIsUndefined(context, rhs))
+                        if (element->name != NULL)
+                            rhs = CYGetProperty(context, aggregate, CYJSString(element->name));
+                        else
+                            goto undefined;
+                        if (JSValueIsUndefined(context, rhs)) undefined:

                             @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"unable to extract structure value" userInfo:nil];
                     }
                 }
                             @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"unable to extract structure value" userInfo:nil];
                     }
                 }


@@ -1506,11 +1538,13 @@ bool Index_(apr_pool_t *pool, Struct_privateData *internal, JSStringRef property
 
         sig::Element *elements(typical->type_.data.signature.elements);
 
 
         sig::Element *elements(typical->type_.data.signature.elements);
 

-        for (size_t local(0); local != count; ++local)
-            if (strcmp(name, elements[local].name) == 0) {
+        for (size_t local(0); local != count; ++local) {
+            sig::Element *element(&elements[local]);
+            if (element->name != NULL && strcmp(name, element->name) == 0) {

                 index = local;
                 goto base;
             }
                 index = local;
                 goto base;
             }

+        }

 
         return false;
     } else {
 
         return false;
     } else {


@@ -1567,8 +1601,19 @@ static void Struct_getPropertyNames(JSContextRef context, JSObjectRef object, JS
     size_t count(typical->type_.data.signature.count);
     sig::Element *elements(typical->type_.data.signature.elements);
 
     size_t count(typical->type_.data.signature.count);
     sig::Element *elements(typical->type_.data.signature.elements);
 

-    for (size_t index(0); index != count; ++index)
-        JSPropertyNameAccumulatorAddName(names, CYJSString(elements[index].name));
+    char number[32];
+
+    for (size_t index(0); index != count; ++index) {
+        const char *name;
+        name = elements[index].name;
+
+        if (name == NULL) {
+            sprintf(number, "%lu", index);
+            name = number;
+        }
+
+        JSPropertyNameAccumulatorAddName(names, CYJSString(name));
+    }

 }
 
 JSValueRef CYCallFunction(apr_pool_t *pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef *arguments, JSValueRef *exception, sig::Signature *signature, ffi_cif *cif, void (*function)()) {
 }
 
 JSValueRef CYCallFunction(apr_pool_t *pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef *arguments, JSValueRef *exception, sig::Signature *signature, ffi_cif *cif, void (*function)()) {


@@ -1681,13 +1726,19 @@ static JSValueRef System_print(JSContextRef context, JSObjectRef object, JSObjec
 static JSValueRef CYApplicationMain(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     CYTry {
         CYPool pool;
 static JSValueRef CYApplicationMain(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     CYTry {
         CYPool pool;

-        NSString *name(CYCastNSObject(pool, context, arguments[0]));
-        int argc(*_NSGetArgc());
-        char **argv(*_NSGetArgv());
+
+        int argc(CYCastDouble(context, arguments[0]));
+        char **argv(CYCastPointer<char **>(context, arguments[1]));
+        NSString *principal(CYCastNSObject(pool, context, arguments[2]));
+        NSString *delegate(CYCastNSObject(pool, context, arguments[3]));
+
+        argc = *_NSGetArgc() - 1;
+        argv = *_NSGetArgv() + 1;

         for (int i(0); i != argc; ++i)
             NSLog(@"argv[%i]=%s", i, argv[i]);
         for (int i(0); i != argc; ++i)
             NSLog(@"argv[%i]=%s", i, argv[i]);

+

         _pooled
         _pooled

-        return CYCastJSValue(context, UIApplicationMain(argc, argv, name, name));
+        return CYCastJSValue(context, UIApplicationMain(argc, argv, principal, delegate));

     } CYCatch
 }
 
     } CYCatch
 }
 

diff --git a/Output.cpp b/Output.cpp
index d5c4502f3e43e5abfff998d9654f280ee0214c16..3396b483207c555a34fccf778fdee0d364ad0786 100644 (file)
--- a/Output.cpp
+++ b/Output.cpp
@@ -46,7 +46,7 @@ bool CYTrue::Value() const {
 
 void CYAddressOf::Output(std::ostream &out, CYFlags flags) const {
     rhs_->Output(out, 1, CYLeft(flags));
 
 void CYAddressOf::Output(std::ostream &out, CYFlags flags) const {
     rhs_->Output(out, 1, CYLeft(flags));

-    out << ".$()";
+    out << ".addressOf()";

 }
 
 void CYArgument::Output(std::ostream &out) const {
 }
 
 void CYArgument::Output(std::ostream &out) const {

diff --git a/Parser.hpp b/Parser.hpp
index 365d1a59a01ac245ea760ae7269bb8db1ffe3f1d..1c5c7abd0a6004d666b1fa5cdf6a256cf6e88959 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -312,6 +312,7 @@ struct CYRange {
     }
 };
 
     }
 };
 

+extern CYRange DigitRange_;

 extern CYRange WordStartRange_;
 extern CYRange WordEndRange_;
 
 extern CYRange WordStartRange_;
 extern CYRange WordEndRange_;
 

diff --git a/todo.txt b/todo.txt
index 1f746c99e84e3236f17f742646aef71233016cdb..f64e66d2fec62cdab72de2f4583dd180bbd224de 100644 (file)
--- a/todo.txt
+++ b/todo.txt
@@ -3,3 +3,4 @@ blocks and empty statements are poorly factored
 functors use both ffiData and ffoData...
 rename "data" variables to "internal"
 unicode identifier support (native and \u)
 functors use both ffiData and ffoData...
 rename "data" variables to "internal"
 unicode identifier support (native and \u)

+object literal compilation should use numerify strings