Rename Instance::Transient to Instance::Permament.

[cycript.git] / ObjectiveC / Library.mm

diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm
index 32426a5ae974d7fdf4b495a5c051d3985690d35e..24ff4ce2bb06699d82ee37411afab53bf6d6e4e3 100644 (file)
--- a/ObjectiveC/Library.mm
+++ b/ObjectiveC/Library.mm
@@ -413,7 +413,7 @@ JSObjectRef Instance::Make(JSContextRef context, id object, Flags flags) {
 }
 
 Instance::~Instance() {
 }
 
 Instance::~Instance() {

-    if ((flags_ & Transient) == 0)
+    if ((flags_ & Permanent) == 0)

         [GetValue() release];
 }
 
         [GetValue() release];
 }
 


@@ -429,11 +429,11 @@ struct Message_privateData :
     }
 };
 
     }
 };
 

-JSObjectRef CYMakeInstance(JSContextRef context, id object, bool transient) {
+JSObjectRef CYMakeInstance(JSContextRef context, id object, bool permanent) {

     Instance::Flags flags;
 
     Instance::Flags flags;
 

-    if (transient)
-        flags = Instance::Transient;
+    if (permanent)
+        flags = Instance::Permanent;

     else {
         flags = Instance::None;
         object = [object retain];
     else {
         flags = Instance::None;
         object = [object retain];


@@ -2840,8 +2840,8 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
 
     CYPool &pool(CYGetGlobalPool());
 
 
     CYPool &pool(CYGetGlobalPool());
 

-    Object_type = new(pool) Type_privateData("@");
-    Selector_type = new(pool) Type_privateData(":");
+    Object_type = new(pool) Type_privateData(sig::object_P);
+    Selector_type = new(pool) Type_privateData(sig::selector_P);

 
     NSArray_ = objc_getClass("NSArray");
     NSBlock_ = objc_getClass("NSBlock");
 
     NSArray_ = objc_getClass("NSArray");
     NSBlock_ = objc_getClass("NSBlock");