From 90fedd6e46208b51acfe80c7de0bca8f3e45bb8d Mon Sep 17 00:00:00 2001
From: Matthias Andreas Benkard <matthias@benkard.de>
Date: Sun, 6 Jul 2008 17:14:35 +0200
Subject: Use NS_VALUERETURN properly.

---
 MLKDynamicContext.m | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'MLKDynamicContext.m')

diff --git a/MLKDynamicContext.m b/MLKDynamicContext.m
index a6ffcca..55d6c4e 100644
--- a/MLKDynamicContext.m
+++ b/MLKDynamicContext.m
@@ -316,13 +316,11 @@ static MLKDynamicContext *global_context;
 {
   NS_DURING
     {
-      return [_restarts valueForSymbol:symbol];
+      NS_VALUERETURN ([_restarts valueForSymbol:symbol], id);
     }
   NS_HANDLER
     {
-      if ([[localException name] isEqualToString: @"MLKUnboundVariableError"])
-        NS_VALUERETURN (nil, id);
-      else
+      if (![[localException name] isEqualToString: @"MLKUnboundVariableError"])
         [localException raise];
     }
   NS_ENDHANDLER;
@@ -335,15 +333,13 @@ static MLKDynamicContext *global_context;
   NS_DURING
     {
       if (_activeHandlerEnvironment)
-        return [[_activeHandlerEnvironment parent] valueForSymbol:symbol];
+        NS_VALUERETURN ([[_activeHandlerEnvironment parent] valueForSymbol:symbol], id);
       else
-        return [_conditionHandlers valueForSymbol:symbol];
+        NS_VALUERETURN ([_conditionHandlers valueForSymbol:symbol], id);
     }
   NS_HANDLER
     {
-      if ([[localException name] isEqualToString: @"MLKUnboundVariableError"])
-        NS_VALUERETURN (nil, id);
-      else
+      if (![[localException name] isEqualToString: @"MLKUnboundVariableError"])
         [localException raise];
     }
   NS_ENDHANDLER;
@@ -355,13 +351,11 @@ static MLKDynamicContext *global_context;
 {
   NS_DURING
     {
-      return [_catchTags valueForSymbol:symbol];
+      NS_VALUERETURN ([_catchTags valueForSymbol:symbol], id);
     }
   NS_HANDLER
     {
-      if ([[localException name] isEqualToString: @"MLKUnboundVariableError"])
-        NS_VALUERETURN (nil, id);
-      else
+      if (![[localException name] isEqualToString: @"MLKUnboundVariableError"])
         [localException raise];
     }
   NS_ENDHANDLER;
-- 
cgit v1.2.3