From 786ddbd4cea2fa9808463a5b2ff23dd40b994846 Mon Sep 17 00:00:00 2001 From: Matthias Andreas Benkard Date: Mon, 30 Jun 2008 21:43:35 +0200 Subject: Simplify environment inheritance. --- MLKDynamicContext.m | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) (limited to 'MLKDynamicContext.m') diff --git a/MLKDynamicContext.m b/MLKDynamicContext.m index d4e1ab6..a2bc151 100644 --- a/MLKDynamicContext.m +++ b/MLKDynamicContext.m @@ -37,15 +37,11 @@ #define MAKE_ENVIRONMENT(variable, parent, parent_member) \ - (variable \ - ? (id) [[MLKEnvironment alloc] \ - initWithParent:(parent \ - ? (id) parent_member \ - : nil) \ - values:variable] \ - : (id) (parent \ - ? (id) RETAIN (parent_member) \ - : [[MLKEnvironment alloc] init])); + [[MLKEnvironment alloc] \ + initWithParent:(parent \ + ? (id) parent_member \ + : nil) \ + values:variable] static MLKDynamicContext *global_context; @@ -373,25 +369,11 @@ static MLKDynamicContext *global_context; -(void) addValue:(id)value forSymbol:(MLKSymbol *)symbol { - if (_parent && _environment == _parent->_environment) - _environment = [[MLKEnvironment alloc] initWithParent:_parent->_environment - values:nil]; - else if (!_environment) - _environment = [[MLKEnvironment alloc] initWithParent:nil - values:nil]; - [[self environment] addValue:value forSymbol:symbol]; } -(void) addBindingForSymbol:(MLKSymbol *)symbol { - if (_parent && _environment == _parent->_environment) - _environment = [[MLKEnvironment alloc] initWithParent:_parent->_environment - values:nil]; - else if (!_environment) - _environment = [[MLKEnvironment alloc] initWithParent:nil - values:nil]; - [[self environment] addBindingForSymbol:symbol]; } -- cgit v1.2.3