refactoring.

sanemat · Jun 26, 2011 · b41fe7d · b41fe7d
1 parent ffd01b0
commit b41fe7d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/ObjCStudy/Bowling2.h b/ObjCStudy/Bowling2.h
@@ -15,8 +15,9 @@
 -(void)roll: (int) pins;
 -(int) score;
 -(BOOL)isStrike: (int) rollIndex;
--(BOOL)isSpare:(int)rollIndex;
--(int)sumOfFrame:(int)rollIndex;
--(int)strikeBonus:(int)rollIndex;
+-(BOOL)isSpare: (int) rollIndex;
+-(int) sumOfFrame: (int) rollIndex;
+-(int) strikeBonus: (int) rollIndex;
+-(int) spareBonus: (int) rollIndex;
 
 @end
diff --git a/ObjCStudy/Bowling2.m b/ObjCStudy/Bowling2.m
@@ -37,14 +37,12 @@ -(int)score
    {
       if ([self isStrike: rollIndex])
       {
-         result    += [self sumOfFrame: rollIndex];
-          result    += [self strikeBonus:rollIndex];
+         result    += [self sumOfFrame: rollIndex] + [self strikeBonus: rollIndex];
          rollIndex += 1;
       }
       else if ([self isSpare: rollIndex])
       {
-         result    += [self sumOfFrame: rollIndex];
-         result    += [[store objectAtIndex: rollIndex + 2] intValue];
+         result    += [self sumOfFrame: rollIndex] + [self spareBonus: rollIndex];
          rollIndex += 2;
       }
       else
@@ -74,8 +72,12 @@ -(int)sumOfFrame: (int) rollIndex
       return([[store objectAtIndex: rollIndex] intValue] + [[store objectAtIndex: rollIndex + 1] intValue]);
    }
 }
--(int)strikeBonus:(int)rollIndex
+-(int)strikeBonus: (int) rollIndex
+{
+   return([[store objectAtIndex: rollIndex + 1] intValue] + [[store objectAtIndex: rollIndex + 2] intValue]);
+}
+-(int)spareBonus: (int) rollIndex
 {
-    return [[store objectAtIndex: rollIndex + 1] intValue] + [[store objectAtIndex: rollIndex + 2] intValue];
+   return([[store objectAtIndex: rollIndex + 2] intValue]);
 }
 @end