[Macattrick-commit] macattrick/scripts objcunit2unitkit.pl,1.1,1.2

[Geisschaes <gei...@us...>]

Update of /cvsroot/macattrick/macattrick/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1199

Modified Files:
	objcunit2unitkit.pl 
Log Message:
init method creation added

Index: objcunit2unitkit.pl
===================================================================
RCS file: /cvsroot/macattrick/macattrick/scripts/objcunit2unitkit.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** objcunit2unitkit.pl	26 Apr 2005 15:51:59 -0000	1.1
--- objcunit2unitkit.pl	27 Apr 2005 08:05:56 -0000	1.2
***************
*** 54,91 ****
  		}
  		elsif(/assertFalse:/) {
! 			if(s/^(.*)\[self\s+assertFalse:(.*)\]\s*;\s*$/${1}UKTrue($2);/) {
  				pl($line, "assertFalse: replaced with UKFalse");	
  			} else {wrong($basename, $line, $_);}
  		}		
  		elsif(/assertNil:/) {
! 			if(s/^(.*)\[self\s+assertNil:(.*)\]\s*;\s*$/${1}UKNil($2);/) {
  				pl($line, "assertNil: replaced with UKNil");	
  			} else {wrong($basename, $line, $_);}
  		}
  		elsif(/assertNotNil:/) {
! 			if(s/^(.*)\[self\s+assertNotNil:(.*)\]\s*;\s*$/${1}UKNotNil($2);/) {
  				pl($line, "assertNotNil: replaced with UKNotNil");	
  			} else {wrong($basename, $line, $_);}
  		}
  		elsif(/assertInt:/) {
! 			if(s/^(.*)\[self\s+assertInt:(.*)equals:(.*)\s*\]\s*;\s*$/${1}UKIntsEqual($2,$3);/) {
  				pl($line, "assertInt:equals: replaced with UKIntsEqual");	
  			} else {wrong($basename, $line, $_);}
  		}
  		elsif(/assertFloat:/) {
! 			if(s/^(.*)\[self\s+assertFloat:(.*)equals:(.*)\s*precision:(.*)\]\s*;\s*$/${1}UKFloatsEqual($2,$3,$4);/) {
  				pl($line, "assertFloat:equals:precision: replaced with UKFloatsEqual");	
  			} else {wrong($basename, $line, $_);}			
  		}
  		elsif(/assertString:/) {
! 			if(s/^(.*)\[self\s+assertString:(.*)equals:(.*)\s*\]\s*;\s*$/${1}UKStringsEqual($2,$3);/) {
  				pl($line, "assertString:equals replaced with UKStringsEqual");	
  			} else {wrong($basename, $line, $_);}			
  		}		
  		elsif(/assert:/) {
! 			if(s/^(.*)\[self\s+assert:(.*)equals:(.*)\s*\]\s*;\s*$/${1}UKObjectsEqual($2,$3);/) {
  				pl($line, "assert:equals replaced with UKObjectsEqual");	
  			} 
! 			elsif(s/^(.*)\[self\s+assert:(.*)same:(.*)\s*\]\s*;\s*$/${1}UKObjectsSame($2,$3);/) {
  				pl($line, "assert:same replaced with UKObjectsSame");	
  			} else {wrong($basename, $line, $_);}			
--- 54,96 ----
  		}
  		elsif(/assertFalse:/) {
! 			if(s/^(.*)\[\s*self\s+assertFalse:(.*)\]\s*;\s*$/${1}UKTrue($2);/) {
  				pl($line, "assertFalse: replaced with UKFalse");	
  			} else {wrong($basename, $line, $_);}
+ 		}
+ 		elsif(/self\s+fail/) {
+ 			if(s/^(.*)\[\s*self\s+fail\s*\]\s*;\s*$/${1}UKFail();/) {
+ 				pl($line, "fail replaced with UKFail");	
+ 			} else {wrong($basename, $line, $_);}
  		}		
  		elsif(/assertNil:/) {
! 			if(s/^(.*)\[\s*self\s+assertNil:(.*)\]\s*;\s*$/${1}UKNil($2);/) {
  				pl($line, "assertNil: replaced with UKNil");	
  			} else {wrong($basename, $line, $_);}
  		}
  		elsif(/assertNotNil:/) {
! 			if(s/^(.*)\[\s*self\s+assertNotNil:(.*)\]\s*;\s*$/${1}UKNotNil($2);/) {
  				pl($line, "assertNotNil: replaced with UKNotNil");	
  			} else {wrong($basename, $line, $_);}
  		}
  		elsif(/assertInt:/) {
! 			if(s/^(.*)\[\s*self\s+assertInt:(.*)equals:(.*)\s*\]\s*;\s*$/${1}UKIntsEqual($2,$3);/) {
  				pl($line, "assertInt:equals: replaced with UKIntsEqual");	
  			} else {wrong($basename, $line, $_);}
  		}
  		elsif(/assertFloat:/) {
! 			if(s/^(.*)\[\s*self\s+assertFloat:(.*)equals:(.*)\s*precision:(.*)\]\s*;\s*$/${1}UKFloatsEqual($2,$3,$4);/) {
  				pl($line, "assertFloat:equals:precision: replaced with UKFloatsEqual");	
  			} else {wrong($basename, $line, $_);}			
  		}
  		elsif(/assertString:/) {
! 			if(s/^(.*)\[\s*self\s+assertString:(.*)equals:(.*)\s*\]\s*;\s*$/${1}UKStringsEqual($2,$3);/) {
  				pl($line, "assertString:equals replaced with UKStringsEqual");	
  			} else {wrong($basename, $line, $_);}			
  		}		
  		elsif(/assert:/) {
! 			if(s/^(.*)\[\s*self\s+assert:(.*)equals:(.*)\s*\]\s*;\s*$/${1}UKObjectsEqual($2,$3);/) {
  				pl($line, "assert:equals replaced with UKObjectsEqual");	
  			} 
! 			elsif(s/^(.*)\[\s*self\s+assert:(.*)same:(.*)\s*\]\s*;\s*$/${1}UKObjectsSame($2,$3);/) {
  				pl($line, "assert:same replaced with UKObjectsSame");	
  			} else {wrong($basename, $line, $_);}			
***************
*** 95,99 ****
  		}
  		elsif(/setUp/) {
! 		 wrong($basename, $line, $_);			
  		}
  		print OUT "$_\n";
--- 100,113 ----
  		}
  		elsif(/setUp/) {
! 			 print OUT "- (id) init {\n";
! 			 print OUT "  self = [super init];\n";
! 			 print OUT "  if(self) {\n";
! 			 print OUT "		[self setUp];\n";	
! 			 print OUT "  }\n";
! 			 print OUT "  return self;\n";
! 			 print OUT "}\n";
! 			 print OUT "\n";
! 			 pl($basename, "init added");
! 			 $line += 8;			
  		}
  		print OUT "$_\n";