Ported Objective-C bridge to match up with the latest compiler changes.

diff --git a/Handler.mm b/Handler.mm
index 40b79f8ec20801e056ee6efd5dab7188d016ff6c..9c1a8dfb78c848ec4f165129fcd126671cd9900d 100644 (file)
--- a/Handler.mm
+++ b/Handler.mm
@@ -131,10 +131,11 @@ struct CYClient :
             } else {
                 NSAutoreleasePool *ar = [[NSAutoreleasePool alloc] init];
 
             } else {
                 NSAutoreleasePool *ar = [[NSAutoreleasePool alloc] init];
 

-                CYContext context(driver.pool_);
+                CYOptions options;
+                CYContext context(driver.pool_, options);

                 driver.program_->Replace(context);
                 std::ostringstream str;
                 driver.program_->Replace(context);
                 std::ostringstream str;

-                CYOutput out(str);
+                CYOutput out(str, options);

                 out << *driver.program_;
                 std::string code(str.str());
                 CYExecute_ execute = {pool, code.c_str()};
                 out << *driver.program_;
                 std::string code(str.str());
                 CYExecute_ execute = {pool, code.c_str()};

diff --git a/ObjectiveC/Replace.mm b/ObjectiveC/Replace.mm
index 6d40c3c2ef04d918f35a2962609322054537067f..5f86ff4997863f2f1ebc3a56d0d68bad29a50ffd 100644 (file)
--- a/ObjectiveC/Replace.mm
+++ b/ObjectiveC/Replace.mm
@@ -127,7 +127,7 @@ CYString *CYSelectorPart::Replace(CYContext &context) {
     std::ostringstream str;
     for (const CYSelectorPart *part(this); part != NULL; part = part->next_) {
         if (part->name_ != NULL)
     std::ostringstream str;
     for (const CYSelectorPart *part(this); part != NULL; part = part->next_) {
         if (part->name_ != NULL)

-            str << part->name_->Value();
+            str << part->name_->Word();

         if (part->value_)
             str << ':';
     }
         if (part->value_)
             str << ':';
     }