Changeset 367 for trunk/Cocoa/Pester/Source/NJRDateFormatter.m

Timestamp:

12/02/07 03:51:55 (17 years ago)

Author:

Nicholas Riley

Message:

DynaLoader-10.[45].a: Tiger and Leopard versions, since Tiger's
DynaLoader.a crashes on Leopard ppc.

DynaLoader.a: Renamed to DynaLoader-10.4.a.

English.lproj/InfoPlist.strings: Updated for 1.1b7.

Info-Pester.plist: Updated for 1.1b7.

NJRDateFormatter.m: Conditionally load ParseDate dylib (see above).

ParseDate.[hm]: Split out from NJRDateFormatter.m.

Read Me.rtfd/TXT.rtf: Updated for 1.1b7.

File:

• trunk/Cocoa/Pester/Source/NJRDateFormatter.m (modified) (6 diffs)

trunk/Cocoa/Pester/Source/NJRDateFormatter.m

@@ -8 +8 @@
 
 #import "NJRDateFormatter.h"
-
-// generated by perl -MExtUtils::Embed -e xsinit -- -o perlxsi.c
-#include <EXTERN.h>
-#include <perl.h>
-
-EXTERN_C void xs_init (pTHX);
-
-EXTERN_C void boot_DynaLoader (pTHX_ CV* cv);
-
-EXTERN_C void
-xs_init(pTHX)
-{
-    char *file = __FILE__;
-    dXSUB_SYS;
-    
-    /* DynaLoader is a special case */
-    newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
-}
-// end generated code
-
-static PerlInterpreter *my_perl;
-static NSDateFormatter *dateManipFormatter;
-
-static NSDate *parse_natural_language_date(NSString *input) {
-    if (my_perl == NULL) return nil;
-    
-    if ([input rangeOfString: @"|"].length > 0) {
-        NSMutableString *sanitized = [[input mutableCopy] autorelease];
-        [sanitized replaceOccurrencesOfString: @"|" withString: @""
-                                      options: NSLiteralSearch
-                                        range: NSMakeRange(0, [sanitized length])];
-        input = sanitized;
-    }
-    
-    NSString *temp = [[NSString alloc] initWithFormat: @"UnixDate(q|%@|, '%%q')", input];
-    // NSLog(@"%@", temp);
-    SV *d = eval_pv([temp UTF8String], TRUE);
-    [temp release];
-    if (d == NULL) return nil;
-    
-    STRLEN s_len;
-    char *s = SvPV(d, s_len);
-    if (s == NULL || s_len == 0) return nil;
-    
-    NSDate *date = [dateManipFormatter dateFromString: [NSString stringWithUTF8String: s]];
-    // NSLog(@"%@", date);
-    
-    return date;
-}
-
-static void init_perl(void) {
-    const char *argv[] = {"", "-CSD", "-I", "", "-MDate::Manip", "-e", "0"};
-    argv[3] = [[[NSBundle mainBundle] resourcePath] fileSystemRepresentation];
-    PERL_SYS_INIT(0, NULL);
-    my_perl = perl_alloc();
-    if (my_perl == NULL) return;
-    
-    perl_construct(my_perl);
-    if (perl_parse(my_perl, xs_init, 7, (char **)argv, NULL) != 0) goto fail;
-    
-    PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
-    if (perl_run(my_perl) != 0) goto fail;
-    
-    // XXX detect localization changes
-    eval_pv("Date_Init(\"Language=English\", \"DateFormat=non-US\", \"Internal=1\"", TRUE);
-
-    if (parse_natural_language_date(@"tomorrow") == nil) goto fail;
-    
-    return;
-    
-fail:
-    perl_destruct(my_perl);
-    perl_free(my_perl);
-    PERL_SYS_TERM();
-    my_perl = NULL;
-}
+#import "ParseDate.h"
+#include <dlfcn.h>
 
 // workaround for bug in Jaguar (and earlier?) NSCalendarDate dateWithNaturalLanguageString:
@@ -120 +46 @@
 + (void)initialize;
 {
-    dateManipFormatter = [[NSDateFormatter alloc] init];
-    [dateManipFormatter setDateFormat: @"yyyyMMddHHmmss"]; // Date::Manip's "%q"
-    init_perl();
+    long minorVersion, majorVersion;
+    Gestalt(gestaltSystemVersionMajor, &majorVersion);
+    Gestalt(gestaltSystemVersionMinor, &minorVersion);
+    if (majorVersion != 10)
+        return;
+    
+    NSString *libName;
+    if (minorVersion == 4) {
+        libName = @"libParseDate-10.4";
+    } else if (minorVersion == 5) {
+        libName = @"libParseDate-10.5";
+    } else {
+        return;
+    }
+    
+    NSString *libPath = [[NSBundle mainBundle] pathForResource: libName ofType: @"dylib"];
+    if (libPath == nil)
+        return;
+    
+    void *lib = dlopen([libPath fileSystemRepresentation], RTLD_LAZY | RTLD_GLOBAL);
+    const char *libError;
+    if ( (libError = dlerror()) != NULL) {
+        NSLog(@"failed to dlopen %@: %s", libPath, libError);
+        return;
+    }
+    
+    parse_natural_language_date = dlsym(lib, "parse_natural_language_date");
+    if ( (libError = dlerror()) != NULL) {
+        NSLog(@"failed to look up parse_natural_language_date in %@: %s", libPath, libError);
+        parse_natural_language_date = NULL;
+        return;
+    }
 }
 
@@ -130 +85 @@
     NSMutableArray *tryFormatters = [[NSMutableArray alloc] init];
     
-    for (NSDateFormatterStyle *s = formatterStyles ; *s < NSDateFormatterNoStyle ; *s++) {
+    for (const NSDateFormatterStyle *s = formatterStyles ; *s < NSDateFormatterNoStyle ; *s++) {
         NSDateFormatter *tryFormatter = [[NSDateFormatter alloc] init];
         [tryFormatter setLenient: YES];
@@ -149 +104 @@
     NSMutableArray *tryFormatters = [[NSMutableArray alloc] init];
     
-    for (NSDateFormatterStyle *s = formatterStyles ; *s < NSDateFormatterNoStyle ; *s++) {
+    for (const NSDateFormatterStyle *s = formatterStyles ; *s < NSDateFormatterNoStyle ; *s++) {
         NSDateFormatter *tryFormatter = [[NSDateFormatter alloc] init];
         [tryFormatter setLenient: YES];
@@ -196 +151 @@
     }
     
+    if (parse_natural_language_date == NULL) return nil;
+
     date = parse_natural_language_date(string);
     if (date != nil) goto success;
@@ -211 +168 @@
 + (BOOL)naturalLanguageParsingAvailable;
 {
-    return (my_perl != NULL);
+    return (parse_natural_language_date != NULL);
 }
 @end