@@ -39,10 +39,10 @@ ifeq ($(SYSTEM), Darwin) LIBDIRS += -L$(PREFIX)/lib endif else - INCLUDES += -I/usr/local/include + INCLUDES += -I/usr/include/GNUstep/Headers FRAMEWORKS = - LIBS = -lm -lpcre -lreadline - LIBDIRS = + LIBS = -lm -lpcre -lreadline -lgnustep-base + LIBDIRS += -L/usr/lib/GNUstep/System/Library/Libraries endif C_FILES = $(wildcard objc/*.c) @@ -67,7 +67,7 @@ LDFLAGS += $(LIBDIRS) LDFLAGS += $(FFI_LIB) ifeq ($(SYSTEM), Linux) - LDFLAGS += -lobjc -lNuFound + LDFLAGS += -lobjc LDFLAGS += -Wl,--rpath -Wl,/usr/local/lib endif Makefile @@ -39,15 +39,17 @@ END) (set @libs '("edit" "ffi" )) (set @lib_dirs (NSMutableArray arrayWithObject:"/usr/lib"))) (else (set @frameworks nil) - (set @libs (list "readline" "ffi" "m" )) - (set @lib_dirs (NSMutableArray arrayWithList:(list "../lib"))))) + (set @libs (list "readline" "ffi" "m" "gnustep-base" )) + (set @lib_dirs (NSMutableArray arrayWithList:(list "/usr/lib/GNUstep/System/Library/Libraries"))))) (if (NSFileManager directoryExistsNamed:"#{@prefix}/lib") (@lib_dirs addObject:"#{@prefix}/lib")) ;; includes (ifDarwin (then (set @includes " -I ./include -I ./include/Nu ")) - (else (set @includes " -I ./include -I ./include/Nu -I /usr/local/include"))) + (else (set @includes " -I ./include -I ./include/Nu -I /usr/local/include -I /usr/include/GNUstep/Headers"))) + +;; cc main.m -fobjc-exceptions -fconstant-string-class=NSConstantString -L/usr/local/lib -lobjc -Wl,--rpath -Wl,/usr/local/lib -I /usr/include/GNUstep/Headers -L/usr/lib/GNUstep/System/Library/Libraries/ -lgnustep-base (if (NSFileManager directoryExistsNamed:"#{@prefix}/include") (@includes appendString:" -I #{@prefix}/include")) @@ -106,7 +108,7 @@ END) join))) (else (set @ldflags ((list - "-lNuFound -L/usr/local/lib -lobjc -Wl,--rpath -Wl,/usr/local/lib" + "-lgnustep-base -L /usr/lib/GNUstep/System/Library/Libraries -L/usr/local/lib -lobjc -Wl,--rpath -Wl,/usr/lib/GNUstep/System/Library/Libraries -Wl,--rpath -Wl,/usr/local/lib" (cond ;; statically link in pcre since most people won't have it.. ((NSFileManager fileExistsNamed:"/usr/lib/libpcre.a") "/usr/lib/libpcre.a") ((NSFileManager fileExistsNamed:"#{@prefix}/lib/libpcre.a") ("#{@prefix}/lib/libpcre.a")) @@ -185,8 +187,9 @@ END) ;; install the dynamic library (SH "sudo cp #{@library_executable_name} #{@installprefix}/lib") ;; copy the headers - (SH "sudo rm -rf /usr/local/include/Nu") - (SH "sudo cp -rp include/Nu /usr/local/include")) + (SH "sudo rm -rf #{@installprefix}/include/Nu") + (SH "sudo cp -rp include/Nu #{@installprefix}/include") + (SH "sudo cp -rp nu/ #{@installprefix}/share/libNu")) (SH "sudo mkdir -p #{@installprefix}/share") (SH "sudo rm -rf #{@installprefix}/share/nu") (SH "sudo cp -rp share/nu #{@installprefix}/share/nu") Nukefile @@ -15,6 +15,8 @@ ;; See the License for the specific language governing permissions and ;; limitations under the License. +(global NSLog (NuBridgedFunction functionWithName:"NSLog" signature:"v@")) + ;; Warning! I want to deprecate these. (global second (do (my-list) (car (cdr my-list)))) (global third (do (my-list) (car (cdr (cdr my-list))))) @@ -91,18 +93,6 @@ (set __args (eval (cdr margs))) (eval (cons __f __args)))) -;; Evaluates an expression and raises a NuAssertionFailure if the result is false. -;; For example (assert (eq 1 1)) does nothing but (assert (eq (+ 1 1) 1)) throws -;; an exception. -(global assert - (macro _ - (set expression (car margs)) - (if (not (eval expression)) - (then (throw ((NSException alloc) - initWithName:"NuAssertionFailure" - reason:(expression stringValue) - userInfo:nil)))))) - ;; Allows mapping a function over multiple lists. ;; For example (map + '(1 2) '(3 4)) returns '(4 6). ;; The length of the result is the same as that of the shortest list passed in. @@ -128,13 +118,34 @@ (else (do (a b) (a compare:b))))) (((apply array ls) sortedArrayUsingBlock:block) list))) +(if (eq (uname) "Darwin") ;; throw is currently only available with the Darwin runtime +(then +;; Evaluates an expression and raises a NuAssertionFailure if the result is false. +;; For example (assert (eq 1 1)) does nothing but (assert (eq (+ 1 1) 1)) throws +;; an exception. +(global assert + (macro _ + (set expression (car margs)) + (if (not (eval expression)) + (then (throw ((NSException alloc) + initWithName:"NuAssertionFailure" + reason:(expression stringValue) + userInfo:nil)))))) + ;; Throws an exception. ;; This function is more concise and easier to remember than throw. (global throw* (do (type reason) (throw ((NSException alloc) initWithName:type reason:reason - userInfo:nil)))) + userInfo:nil))))) +(else +(global assert (macro _ (NSLog "warning: assert is unavailable"))) +(global throw* (macro _ (NSLog "warning: throw* is unavailable"))) +(global throw (macro _ (NSLog "warning: throw is unavailable"))))) + + + ;; Returns an array of filenames matching a given pattern. ;; the pattern is a string that is converted into a regular expression. nu/nu.nu @@ -137,6 +137,8 @@ (set @failures (+ @failures 1))) nil) +(if (eq (uname) "Darwin") +(then (macro-0 assert_throws (set @assertions (+ @assertions 1)) (set __desired (eval (car margs))) @@ -153,7 +155,9 @@ (else (puts "failure: exception #{__desired} was not thrown") (set @failures (+ @failures 1)))) - nil) + nil)) +(else ;; unfortunately, we can only throw exceptions with the Darwin runtime +(macro-0 assert_throws nil))) (macro-0 assert_in_delta (set @assertions (+ @assertions 1)) nu/test.nu @@ -15,6 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ +#import "st.h" #ifdef LINUX #define __USE_GNU #endif @@ -32,7 +33,6 @@ limitations under the License. #import "operator.h" #import "bridge.h" #import "extensions.h" -#import "st.h" #import "reference.h" #import "pointer.h" #import "handler.h" @@ -1053,15 +1053,26 @@ id nu_calling_objc_method_handler(id target, Method_t m, NSMutableArray *args) } if (success) { result = get_nu_value_from_objc_value(result_value, &return_type_buffer[0]); + // NSLog(@"result is %@", result); + // NSLog(@"retain count %d", [result retainCount]); // Return values should not require a release. // Either they are owned by an existing object or are autoreleased. // Since these methods create new objects that aren't autoreleased, we autorelease them. // But we must never release placeholders. +#ifdef DARWIN bool already_retained = // see Anguish/Buck/Yacktman, p. 104 (s == @selector(alloc)) || (s == @selector(allocWithZone:)) || (s == @selector(copy)) || (s == @selector(copyWithZone:)) || (s == @selector(mutableCopy)) || (s == @selector(mutableCopyWithZone:)) || (s == @selector(new)); +#else + bool already_retained = // see Anguish/Buck/Yacktman, p. 104 + sel_eq(s, @selector(alloc)) || sel_eq(s, @selector(allocWithZone:)) + || sel_eq(s, @selector(copy)) || sel_eq(s, @selector(copyWithZone:)) + || sel_eq(s, @selector(mutableCopy)) || sel_eq(s, @selector(mutableCopyWithZone:)) + || sel_eq(s, @selector(new)); +#endif + //NSLog(@"already retained? %d", already_retained); if (already_retained) { // Make sure this isn't an instance of a placeholder class. // We should never release instances of placeholder classes; @@ -1296,7 +1307,9 @@ 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); +#ifdef DARWIN [[NSGarbageCollector defaultCollector] disableCollectorForPointer: block]; +#endif // insert the method handler in the class method table nu_class_replaceMethod(c, selector, imp, signature_str); objc/bridge.m @@ -262,7 +262,7 @@ extern id Nu__null; - (NSString *) escapedStringRepresentation { - NSMutableString *result = [NSMutableString stringWithString:@"\""]; + NSMutableString *result = [[NSMutableString stringWithString:@"\""] retain]; // not right int length = [self length]; for (int i = 0; i < length; i++) { unichar c = [self characterAtIndex:i]; @@ -423,7 +423,7 @@ extern id Nu__null; for (int i = 0; i < count; i++) { @try { - [args setCar:[NSNumber numberWithInteger:[self characterAtIndex:i]]]; + [args setCar:[[[NSNumber alloc] initWithInt:[self characterAtIndex:i]] autorelease]]; [block evalWithArguments:args context:Nu__null]; } @catch (NuBreakException *exception) { @@ -440,6 +440,7 @@ extern id Nu__null; } #ifdef LINUX +/* + (NSString *) stringWithCString:(const char *) cString encoding:(NSStringEncoding) encoding { return [[[NSString alloc] initWithCString:cString] autorelease]; @@ -449,19 +450,15 @@ extern id Nu__null; { return [self cString]; } +*/ #endif @end @implementation NSMutableString(Nu) - (void) appendCharacter:(unichar) c { - #ifdef DARWIN [self appendFormat:@"%C", c]; - #else - [self appendFormat:@"%c", (char) c]; - #endif } - @end @implementation NSData(Nu) @@ -799,7 +796,8 @@ extern id Nu__null; } return result; #else - return [NSString stringWithCString:types]; + //return [NSString stringWithCString:types]; + return [NSString stringWithCString:_methodTypes]; #endif } objc/extensions.m @@ -15,8 +15,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#import "method.h" #import "st.h" +#import "method.h" #import "extensions.h" @implementation NuMethod objc/method.m @@ -294,8 +294,11 @@ void NuInit() #endif #else + // Non-Apple platforms + #ifndef MININUSH [[Nu parser] parseEval:@"(load \"nu\")"]; #endif + #endif } } objc/nu.m @@ -55,7 +55,10 @@ BOOL class_conformsToProtocol(Class cls, Protocol *protocol); Protocol **class_copyProtocolList(Class cls, unsigned int *outCount); Method_t class_getInstanceMethod(Class cls, SEL name); Ivar_t class_getInstanceVariable(Class cls, const char *name); -struct objc_method_list *class_nextMethodList(Class, void **); + +// defined as a macro in GNUstep +// struct objc_method_list *class_nextMethodList( Class cls, void **methods); + const char *ivar_getName(Ivar_t v); unsigned method_getArgumentInfo(struct objc_method *m, int arg, const char **type, int *offset); unsigned int method_getNumberOfArguments(Method_t m); @@ -131,5 +134,6 @@ void nu_markEndOfObjCTypeString(char *type, size_t len); void nu_swizzleContainerClasses(); #ifdef LINUX -Method_t class_getClassMethod (MetaClass class, SEL op); +// defined as a macro in GNUstep +// Method_t class_getClassMethod (MetaClass class, SEL op); #endif objc/objc_runtime.h @@ -37,22 +37,26 @@ limitations under the License. // it seems that in the GNU runtime, this function is supposed to get the metaclass, // but in the NeXT runtime, it gets the class. +/* Method_t class_getClassMethod (MetaClass class, SEL op) { return class_get_class_method(class->class_pointer, op); } +*/ Class objc_getClass (const char *name) { return objc_lookup_class(name); } +/* void class_add_method_list (Class class, MethodList_t list); void class_addMethods(Class cls, struct objc_method_list *methods) { class_add_method_list(cls, methods); } +*/ BOOL class_addProtocol(Class cls, Protocol *protocol) { @@ -69,10 +73,12 @@ Protocol **class_copyProtocolList(Class cls, unsigned int *outCount) return 0; } +/* Method_t class_getInstanceMethod(Class cls, SEL name) { return class_get_instance_method(cls, name); } +*/ Ivar_t class_getInstanceVariable(Class cls, const char *name) { @@ -95,6 +101,7 @@ Ivar_t class_getInstanceVariable(Class cls, const char *name) return NULL; } +/* struct objc_method_list *class_nextMethodList(Class cls, void **methodList) { if (!(*methodList)) { @@ -105,6 +112,7 @@ struct objc_method_list *class_nextMethodList(Class cls, void **methodList) } return *methodList; } +*/ char *method_get_nth_argument (struct objc_method *m, arglist_t argframe, int arg, const char **type); objc/objc_runtime.m @@ -366,7 +366,7 @@ static int nu_octal_digit_value(unichar c) return 0; } -static int nu_hex_digit_value(unichar c) +static unichar nu_hex_digit_value(unichar c) { int x = (c - '0'); if ((x >= 0) && (x <= 9)) @@ -393,7 +393,8 @@ static unichar nu_hex_digits_to_unichar(unichar c1, unichar c2) static unichar nu_unicode_digits_to_unichar(unichar c1, unichar c2, unichar c3, unichar c4) { - return nu_hex_digit_value(c1)*4096 + nu_hex_digit_value(c2)*256 + nu_hex_digit_value(c3)*16 + nu_hex_digit_value(c4); + unichar value = nu_hex_digit_value(c1)*4096 + nu_hex_digit_value(c2)*256 + nu_hex_digit_value(c3)*16 + nu_hex_digit_value(c4); + return value; } static int nu_parse_escape_sequences(NSString *string, int i, int imax, NSMutableString *partial) objc/parser.m @@ -15,6 +15,7 @@ #import <Foundation/NSObject.h> #import <Foundation/NSRange.h> +#import <Foundation/NSEnumerator.h> @class NuRegex, NSArray, NSString; objc/regex.h @@ -15,8 +15,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#import "symbol.h" #import "st.h" +#import "symbol.h" #import "class.h" #import "object.h" #import "extensions.h" @@ -57,7 +57,9 @@ static NuSymbolTable *sharedSymbolTable = 0; symbol = [[NuSymbol alloc] init]; // keep construction private symbol->string = strdup(string); // the symbol table does not use strong refs so make one here for each symbol +#ifdef DARWIN [[NSGarbageCollector defaultCollector] disableCollectorForPointer:symbol]; +#endif int len = strlen(string); symbol->isLabel = (string[len - 1] == ':'); symbol->isGensym = (len > 2) && (string[0] == '_') && (string[1] == '_'); @@ -107,7 +109,9 @@ static int add_to_array(st_data_t k, st_data_t v, st_data_t d) //NSLog(@"removing symbol %@ from table", [symbol stringValue]); st_delete(symbol_table, (st_data_t *) &(symbol->string), 0); [symbol release]; // on behalf of the table +#ifdef DARWIN [[NSGarbageCollector defaultCollector] enableCollectorForPointer:self]; +#endif } @end objc/symbol.m @@ -72,13 +72,17 @@ static int deallocationCount = 0; + (void) resetDeallocationCount { +#ifdef DARWIN [[NSGarbageCollector defaultCollector] collectExhaustively]; +#endif deallocationCount = 0; } + (int) deallocationCount { +#ifdef DARWIN [[NSGarbageCollector defaultCollector] collectExhaustively]; +#endif return deallocationCount; } objc/testhelper.m @@ -18,9 +18,7 @@ (finally (set z 99))) (assert_equal "this should always be set" before) (assert_equal nil after) - (if (eq (uname) "Darwin") - (then (assert_equal "NSRangeException" name)) - (else (assert_equal "Index out of range" name))) + (assert_equal "NSRangeException" name) (assert_equal 99 z)) (imethod (id) testUserRaisedException is test/test_exceptions.nu @@ -5,6 +5,8 @@ (load "match") +(if (eq (uname) "Darwin") ;; pattern matching is broken on Linux because it relies on throw, which is not working with the GNU runtime. + (class TestDestructuring is NuTestCase (imethod (id) testFindFirstMatch is @@ -200,4 +202,4 @@ (assert_equal '(1 (2 3)) (list a b)) (assert_throws "NuMatchException" - (match-set (a a) '(1 2))))) + (match-set (a a) '(1 2)))))) test/test_match.nu @@ -5,7 +5,8 @@ (class TestMemory is NuTestCase -(unless ((NSGarbageCollector defaultCollector) isEnabled) +(unless (and (eq (uname) "Darwin") + ((NSGarbageCollector defaultCollector) isEnabled)) (- testCreationInObjCUsingObjC is (NuTestHelper resetDeallocationCount) (5 times: test/test_memory.nu @@ -125,8 +125,8 @@ END) (assert_equal "\"~\\x7f\"" ("\x7e\x7f" escapedStringRepresentation)) ;; verify escaping of higher-valued one-byte characters (assert_equal "\"\\xe0\\xf0\"" ("\xE0\xf0" escapedStringRepresentation)) - ;; verify escaping of unicode characters - (assert_equal "\"\\u0100\\uffff\"" ("\u0100\uffFF" escapedStringRepresentation))) + ;; verify escaping of unicode characters (\ufffe and \uffff are not valid characters) + (assert_equal "\"\\u0100\\ufffd\"" ("\u0100\uffFD" escapedStringRepresentation))) (imethod (id) testStringEach is (set start "hello, world") test/test_strings.nu baked/baked_beautify.m baked/baked_bridgesupport.m baked/baked_cocoa.m baked/baked_console.m baked/baked_coredata.m baked/baked_doc.m baked/baked_fscript.m baked/baked_generate.m baked/baked_help.m baked/baked_menu.m baked/baked_nibtools.m baked/baked_nu.m baked/baked_template.m baked/baked_test.m 47f6be62493e046a57df75b6a880dc02b7b2cfb9 Tim Burks tim@debian.neontology.com http://github.com/timburks/nu/commit/8cd90142144996fcbdabf691bde25cdb2a9b715b 8cd90142144996fcbdabf691bde25cdb2a9b715b 2008-12-14T08:50:13-08:00 2008-12-14T08:50:13-08:00 Changes to allow Nu to run with GNUstep-base on Linux. Tested on Debian "Etch" running under VMware. NuFound (aka libFoundation) support is now dropped, since GNUstep is actively-maintained and contains important features missing in libFoundation, notably UTF-8 support. Because the Linux build is running on the GNU Objective-C runtime, the "throw" operator is not available, and because the Nu "match" operator is currently a heavy user of "throw", use of the "match" operator should be avoided on Linux. 8bea75ff4d4814325764a8c4f761fd115e8c0fb8 Tim Burks tim@debian.neontology.com