summaryrefslogtreecommitdiff
path: root/MLKDynamicContext.m
diff options
context:
space:
mode:
authorMatthias Andreas Benkard <matthias@benkard.de>2008-07-06 17:14:35 +0200
committerMatthias Andreas Benkard <matthias@benkard.de>2008-07-06 17:14:35 +0200
commit90fedd6e46208b51acfe80c7de0bca8f3e45bb8d (patch)
tree50a26637f6bdb3000623a7ff6c616bec28fd22fe /MLKDynamicContext.m
parenta4dc2ef855a0513db78ce00338602fbdad9c33da (diff)
Use NS_VALUERETURN properly.
Diffstat (limited to 'MLKDynamicContext.m')
-rw-r--r--MLKDynamicContext.m20
1 files changed, 7 insertions, 13 deletions
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;