Changeset 8174 for lang/objective-c

Timestamp:

03/20/08 00:52:05 (9 months ago)

Author:

psychs

Message:

Cleaning up

Location:

lang/objective-c/CocoaOniguruma

Files:

• core/OnigRegexp.m (modified) (3 diffs)
• sample/AppController.m (modified) (3 diffs)
• sample/CocoaOniguruma/OnigRegexp.m (modified) (3 diffs)

lang/objective-c/CocoaOniguruma/core/OnigRegexp.m

@@ -26 +26 @@
 {
   if (_entity) onig_free(_entity);
-  if (_expression) [_expression release];
+  [_expression release];
   [super dealloc];
 }
@@ -168 +168 @@
   [_expression release];
   if (_region) onig_region_free(_region, 1);
-  if (_target) [_target release];
+  [_target release];
   [super dealloc];
 }
@@ -235 +235 @@
 {
   NSIndexSet* indexes = [self indexesForName:name];
-  return indexes ? [indexes firstIndex]  : -1;
+  return indexes ? [indexes firstIndex] : -1;
 }
 

lang/objective-c/CocoaOniguruma/sample/AppController.m

@@ -26 +26 @@
     [self log:[NSString stringWithFormat:@"str: %@", s]];
     [self log:[NSString stringWithFormat:@"length: %d", [s length]]];
-  
+    
     [self log:@""];
     
@@ -32 +32 @@
     if (res) {
       [self log:@"matched"];
-    
+      
       int size = [res size];
       int i;
@@ -56 +56 @@
     [self log:[NSString stringWithFormat:@"str: %@", s]];
     [self log:[NSString stringWithFormat:@"length: %d", [s length]]];
-  
+    
+    [self log:@""];
+    
     OnigResult* res = [regex search:s];
     if (res) {
       [self log:@"matched"];
-    
+      
       int size = [res size];
       [self log:[NSString stringWithFormat:@"size: %d", size]];
-    
+      
       int i;
       for (i=0; i<size; i++) {
         [self log:[NSString stringWithFormat:@"  res[%d]: %@ @ %d", i, [res stringAt:i], [res locationAt:i]]];
       }
-    
+      
       [self log:[NSString stringWithFormat:@"  name['digits']: %@", [res stringForName:@"digits"]]];
       [self log:[NSString stringWithFormat:@"  name['letters']: %@", [res stringForName:@"letters"]]];
-    
+      
     } else {
       [self log:@"not matched"];

lang/objective-c/CocoaOniguruma/sample/CocoaOniguruma/OnigRegexp.m

@@ -26 +26 @@
 {
   if (_entity) onig_free(_entity);
-  if (_expression) [_expression release];
+  [_expression release];
   [super dealloc];
 }
@@ -168 +168 @@
   [_expression release];
   if (_region) onig_region_free(_region, 1);
-  if (_target) [_target release];
+  [_target release];
   [super dealloc];
 }
@@ -235 +235 @@
 {
   NSIndexSet* indexes = [self indexesForName:name];
-  return indexes ? [indexes firstIndex]  : -1;
+  return indexes ? [indexes firstIndex] : -1;
 }