included ArrayFileCommandLineOption.

git-archimport-id: [email protected]/torch--devel--1.0--patch-74

Author: Ronan Collobert

base/T4CommandLine.h

@@ -27,11 +27,13 @@
 -addRealOption: (NSString*)aName at: (real*)anAddress default: (real)aDefault help: (NSString*)aHelp;
 -addBoolOption: (NSString*)aName at: (BOOL*)anAddress default: (BOOL)aDefault help: (NSString*)aHelp;
 -addStringOption: (NSString*)aName at: (NSString**)anAddress default: (NSString*)aDefault help: (NSString*)aHelp;
+-addArrayFileOption: (NSString*)aName at: (NSArray**)anAddress default: (NSArray*)aDefault help: (NSString*)aHelp;
 
 -addArgument: (T4CommandLineOption*)argument;
 -addIntArgument: (NSString*)aName at: (int*)anAddress help: (NSString*)aHelp;
 -addRealArgument: (NSString*)aName at: (real*)anAddress help: (NSString*)aHelp;
 //-addBoolArgument: (NSString*)aName at: (BOOL*)anAddress help: (NSString*)aHelp; peut pas exister!!!
 -addStringArgument: (NSString*)aName at: (NSString**)anAddress help: (NSString*)aHelp;
+-addArrayFileArgument: (NSString*)aName at: (NSArray**)anAddress help: (NSString*)aHelp;
 
 @end

base/T4CommandLine.m

@@ -321,6 +321,14 @@ -(int)read
   return [self addOption: option];
 }
 
+-addArrayFileOption: (NSString*)aName at: (NSArray**)anAddress default: (NSArray*)aDefault help: (NSString*)aHelp
+{
+  T4ArrayFileCommandLineOption *option = [T4ArrayFileCommandLineOption alloc];
+  [option initWithName: aName at: anAddress default: aDefault help: aHelp];
+  [allocator keepObject: option];
+  return [self addOption: option];
+}
+
 -addArgument: (T4CommandLineOption*)argument
 {
   NSMutableArray *currentArguments = [arguments objectForKey: currentSwitch];
@@ -353,4 +361,12 @@ -(int)read
   return [self addArgument: option];
 }
 
+-addArrayFileArgument: (NSString*)aName at: (NSArray**)anAddress help: (NSString*)aHelp
+{
+  T4ArrayFileCommandLineOption *option = [T4ArrayFileCommandLineOption alloc];
+  [option initWithName: aName at: anAddress default: nil help: aHelp];
+  [allocator keepObject: option];
+  return [self addArgument: option];  
+}
+
 @end

base/T4CommandLineOption.h

@@ -62,3 +62,13 @@
 -initWithName: (NSString*)aName at: (NSString**)anAddress default: (NSString*)aDefaultValue help: (NSString*)aHelp;
 
 @end
+
+@interface T4ArrayFileCommandLineOption : T4CommandLineOption
+{
+  NSArray **address;
+  NSArray *defaultValue;
+}
+
+-initWithName: (NSString*)aName at: (NSArray**)anAddress default: (NSArray*)aDefaultValue help: (NSString*)aHelp;
+
+@end

base/T4CommandLineOption.m

@@ -1,4 +1,5 @@
 #import "T4CommandLineOption.h"
+#import "T4DiskFile.h"
 
 @implementation T4CommandLineOption
 
@@ -236,3 +237,69 @@ -(NSString*)textValue
 }
 
 @end
+
+@implementation T4ArrayFileCommandLineOption
+
+-initWithName: (NSString*)aName at: (NSArray**)anAddress default: (NSArray*)aDefaultValue help: (NSString*)aHelp
+{
+  if( (self = [super initWithName: aName type: @"<string>" help: aHelp]) )
+  {
+    address = anAddress;
+    defaultValue = aDefaultValue;
+  }
+  
+  return self;
+}
+
+-read: (NSMutableArray*)arguments
+{
+  if([arguments count] > 0)
+  {
+    NSString *fileName = [arguments objectAtIndex: 0];
+    T4DiskFile *file = [[T4DiskFile alloc] initForReadingAtPath: fileName];
+    NSMutableArray *array = [[[NSMutableArray alloc] init] keepWithAllocator: allocator];
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSCharacterSet *whitespaceAndNewlineCharacterSet = [NSCharacterSet whitespaceAndNewlineCharacterSet];
+    while(![file isEndOfFile])
+    {
+      NSString *currentLine = [[file stringToEndOfLine] stringByTrimmingCharactersInSet: whitespaceAndNewlineCharacterSet];
+      if([currentLine length] > 0)
+        [array addObject: currentLine];
+    }      
+    [pool release];
+    *address = array;
+    [file release];
+    [arguments removeObjectAtIndex: 0];
+  }
+  else
+    T4Error(@"ArrayFileCommandLineOption: cannot correctly set <%@>", name);
+  
+  isSet = YES;
+
+  return self;
+}
+
+-initToDefaultValue
+{
+  if(defaultValue)
+    *address = [[[NSArray alloc] initWithArray: defaultValue] keepWithAllocator: allocator];
+  else
+    *address = [[[NSArray alloc] init] keepWithAllocator: allocator];
+
+  return self;
+}
+
+-(NSString*)textValue
+{
+  if(isSet)
+    return [*address description];
+  else
+  {
+    if(defaultValue)
+      return [defaultValue description];
+    else
+      return [NSString stringWithString: @""];
+  }
+}
+
+@end