@@ -2,7 +2,7 @@ ;; this file gets evaluated when the bundle is injected ;; (unless $console ;; guard against multiple injection - (load "console") + (load "console") (set $console ((NuConsoleWindowController alloc) init)) (if (set appName (((NSBundle mainBundle) localizedInfoDictionary) objectForKey:"CFBundleName")) (($console window) setTitle:"Nu Console (#{appName})")) examples/NuAnywhere/NuConsole/nu/main.nu @@ -5,8 +5,9 @@ (set @nu_files (filelist "^nu/.*\.nu$")) (set @frameworks '("Cocoa" "Nu" "Carbon")) -(set @ldflags " -framework Cocoa -framework Nu -framework Carbon -linject -L../libinject ") +(set @ldflags " -framework Cocoa -framework Nu -framework Carbon -linject -L../libinject -fobjc-gc ") (set @includes " -I../libinject/objc") +(set @mflags " -fobjc-gc ") ;; framework description (set @framework "NuInject") examples/NuAnywhere/NuInject/Nukefile @@ -126,6 +126,7 @@ (w makeKeyAndOrderFront:self))) (@console setFonts) ;; apparently this must be done AFTER the window is brought onscreen + (@console loadFile:"~/.nu") self) ;; When a window resizes, move the cursor to the end of the input. @@ -176,7 +177,12 @@ ;; It controls a Cocoa text view containing an interactive Nu console. (class NuConsoleViewController is NSObject (ivar (id) textview (id) startOfInput (id) insertionPoint (id) parser (id) history (id) index (id) count (id) chunk) - + + (imethod (id) loadFile:(id)file is + ((_parser parse: (NSString stringWithContentsOfFile: + (file stringByResolvingSymlinksInPath))) + evalWithContext: (_parser context))) + ;; Initialize a controller with a specified frame. (imethod (id) initWithFrame:(NSRect) frame is (super init) @@ -338,6 +344,7 @@ (unless (@parser incomplete) (set @insertionPoint @startOfInput) (set result (@parser eval: code)) + (((@parser symbolTable) symbolWithString: "!!") setValue: result) (if (send result respondsToSelector:"escapedStringRepresentation") (then (set stringToDisplay (send result escapedStringRepresentation))) (else (set stringToDisplay (send result stringValue)))) nu/console.nu @@ -1296,7 +1296,7 @@ id add_method_to_class(Class c, NSString *methodName, NSString *signature, NuBlo if (!nu_block_table) nu_block_table = st_init_numtable(); // watch for problems caused by these ugly casts... st_insert(nu_block_table, (long) imp, (long) block); - [[NSGarbageCollector defaultCollector] disableCollectorForPointer: block]; + [[NSGarbageCollector defaultCollector] disableCollectorForPointer: block]; // insert the method handler in the class method table nu_class_replaceMethod(c, selector, imp, signature_str); objc/bridge.m @@ -646,7 +646,6 @@ limitations under the License. NuSymbolTable *symbolTable = [context objectForKey:SYMBOLS_KEY]; id object = [context lookupObjectForKey:[symbolTable symbolWithCString:"self"]]; id ivar = [[symbol stringValue] substringFromIndex:1]; - //NSLog(@"setting value for ivar %@ to %@", ivar, result); [object setValue:result forIvar:ivar]; } else { objc/operator.m @@ -104,10 +104,9 @@ static int add_to_array(st_data_t k, st_data_t v, st_data_t d) - (void) removeSymbol:(NuSymbol *) symbol { - //NSLog(@"removing symbol %@ from table", [symbol stringValue]); st_delete(symbol_table, (st_data_t *) &(symbol->string), 0); [symbol release]; // on behalf of the table - [[NSGarbageCollector defaultCollector] enableCollectorForPointer:self]; + [[NSGarbageCollector defaultCollector] enableCollectorForPointer: symbol]; } @end objc/symbol.m 1c1ef72f35cb5f0d942d75e52bcac6db67f98c28 e6d9ec82a687992c6f8a76547cfb643265f9ba83 Tim Burks tim@sunfire.neontology.com http://github.com/timburks/nu/commit/1d34518c0b31b2c93ffd500ee521c4b3ea6ee9e2 1d34518c0b31b2c93ffd500ee521c4b3ea6ee9e2 2008-12-28T14:12:10-08:00 2008-12-28T14:12:10-08:00 Merge git://github.com/ekellner/nu Conflicts: examples/NuAnywhere/NuInject/Nukefile objc/bridge.m objc/symbol.m 725c79c82a0ef01ae74b804fb7780f026b4f1553 Tim Burks tim@sunfire.neontology.com