From f8d5260c544566dadb091019045e4c002e3ebf68 Mon Sep 17 00:00:00 2001 From: Stefan Urbanek Date: Sun, 21 Sep 2003 16:12:46 +0000 Subject: [PATCH] Added few named objects git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/steptalk/trunk@17694 72102866-910b-0410-8b05-ffd578937521 --- Examples/Shell/ChangeLog | 4 ++++ Examples/Shell/STShell.m | 13 +++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Examples/Shell/ChangeLog b/Examples/Shell/ChangeLog index 10ff36e..18d0341 100644 --- a/Examples/Shell/ChangeLog +++ b/Examples/Shell/ChangeLog @@ -1,3 +1,7 @@ +2003 Sep 21 + + * Added named objects FileManager, LastCommand and LastObject + 2003 Jun 19 * Renamed stshell.m to stshell_tool.m. MS Windows was causing problems with diff --git a/Examples/Shell/STShell.m b/Examples/Shell/STShell.m index 745a613..37301b3 100644 --- a/Examples/Shell/STShell.m +++ b/Examples/Shell/STShell.m @@ -34,6 +34,7 @@ #import #import #import +#import #import #import #import @@ -155,10 +156,13 @@ int complete_handler(void) [env setCreatesUnknownObjects:YES]; + /* Add standard objects */ [env setObject:self forName:@"Shell"]; [env setObject:self forName:@"Transcript"]; [env setObject:objectStack forName:@"Objects"]; + [env setObject:[NSFileManager defaultManager] forName:@"FileManager"]; + /* FIXME: This is unsafe !*/ [env setObject:env forName:@"Environment"]; @@ -194,16 +198,21 @@ int complete_handler(void) } - (id)executeLine:(NSString *)line { + NSString *cmd; id result = nil; /* FIXME: why? */ - line = [line stringByAppendingString:@" "]; + + cmd = [line stringByAppendingString:@" "]; NS_DURING - result = [engine executeCode:line inEnvironment:env]; + result = [engine executeCode:cmd inEnvironment:env]; NS_HANDLER [self showException:localException]; NS_ENDHANDLER + [env setObject:line forName:@"LastCommand"]; + [env setObject:result forName:@"LastObject"]; + return result; }