Changed "%zu" to "%"APR_SIZE_T_FMT on APR format calls, removed the accidental NSAuto...

diff --git a/Library.cpp b/Library.cpp
index 383008a80328a899ffc4501b86a9e51790018672..0a8508efe03a19ae635b85bc997877e1c3904b09 100644 (file)
--- a/Library.cpp
+++ b/Library.cpp
@@ -539,7 +539,7 @@ static size_t Nonce_(0);
 
 static JSValueRef $cyq(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     CYPool pool;
 
 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, name);
 }
 

diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm
index 1de5595effa1035119350fd40fe9f9d764a77654..9c7bcc1dc3bce6957e480feeabf42dac5a7edf70 100644 (file)
--- a/ObjectiveC/Library.mm
+++ b/ObjectiveC/Library.mm
@@ -1287,9 +1287,11 @@ JSValueRef CYObjectiveC_RuntimeProperty(JSContextRef context, CYUTF8String name)
     return NULL;
 } CYPoolCatch(NULL) return /*XXX*/ NULL; }
 
     return NULL;
 } CYPoolCatch(NULL) return /*XXX*/ NULL; }
 

-static void CYObjectiveC_CallFunction(JSContextRef context, ffi_cif *cif, void (*function)(), uint8_t *value, void **values) { CYPoolTry {
+static void CYObjectiveC_CallFunction(JSContextRef context, ffi_cif *cif, void (*function)(), uint8_t *value, void **values) { @try {

     ffi_call(cif, function, value, values);
     ffi_call(cif, function, value, values);

-} CYPoolCatch() }
+} @catch (NSException *error ) {
+    throw CYJSError(context, CYCastJSValue(context, error));
+} }

 
 static bool CYObjectiveC_PoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYPoolTry  {
     switch (type->primitive) {
 
 static bool CYObjectiveC_PoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYPoolTry  {
     switch (type->primitive) {

diff --git a/sig/parse.cpp b/sig/parse.cpp
index 9eac602be37620ec19185e049c9221b7d748e9e9..b8d16c32684c7d75aabf183fdc1c6ac2b2be9c14 100644 (file)
--- a/sig/parse.cpp
+++ b/sig/parse.cpp
@@ -265,11 +265,11 @@ const char *Unparse(apr_pool_t *pool, struct Type *type) {
 
         case array_P: {
             const char *value = Unparse(pool, type->data.data.type);
 
         case array_P: {
             const char *value = Unparse(pool, type->data.data.type);

-            return apr_psprintf(pool, "[%zu%s]", type->data.data.size, value);
+            return apr_psprintf(pool, "[%"APR_SIZE_T_FMT"%s]", type->data.data.size, value);

         } break;
 
         case pointer_P: return apr_psprintf(pool, "^%s", type->data.data.type == NULL ? "v" : Unparse(pool, type->data.data.type));
         } break;
 
         case pointer_P: return apr_psprintf(pool, "^%s", type->data.data.type == NULL ? "v" : Unparse(pool, type->data.data.type));

-        case bit_P: return apr_psprintf(pool, "b%zu", type->data.data.size);
+        case bit_P: return apr_psprintf(pool, "b%"APR_SIZE_T_FMT"", type->data.data.size);

         case char_P: return "c";
         case double_P: return "d";
         case float_P: return "f";
         case char_P: return "c";
         case double_P: return "d";
         case float_P: return "f";

diff --git a/todo.txt b/todo.txt
index f61cb94c4a7afa3a4a680b407f9ad2697470ec87..531b6a4bb3a2203751dd4f497af6f04c49c12465 100644 (file)
--- a/todo.txt
+++ b/todo.txt
@@ -5,9 +5,17 @@ look into what String is, and whether to bridge it
 some JS callbacks don't use exception pointers at all...
 a newline needs to not be allowed after a unary *
 finish implementing default xml namespace statement
 some JS callbacks don't use exception pointers at all...
 a newline needs to not be allowed after a unary *
 finish implementing default xml namespace statement

+encode newlines in history for later reply (psql uses ^A)
+

 consider replacing regex literals with constructors
   https://bugzilla.mozilla.org/show_bug.cgi?id=98409
 numerification needs to use specific precision values
   https://bugzilla.mozilla.org/show_bug.cgi?id=5856
 consider a mode where unicode string content is saved
   https://bugzilla.mozilla.org/show_bug.cgi?id=274152
 consider replacing regex literals with constructors
   https://bugzilla.mozilla.org/show_bug.cgi?id=98409
 numerification needs to use specific precision values
   https://bugzilla.mozilla.org/show_bug.cgi?id=5856
 consider a mode where unicode string content is saved
   https://bugzilla.mozilla.org/show_bug.cgi?id=274152

+
+cy# SBAwayController.sharedAwayController->_displayValues
+"*** -[NSCFNumber length]: unrecognized selector sent to instance 0x4a4bda0"
+b = []; for (x in a) b.push(x); <- crashes
+
+errors in another process aren't displayed; to fix this, parse errors should get converted to exceptions and thrown