diff options
| author | totycro <totycro@unknown-horizons.org> | 2012-05-23 10:48:40 +0200 |
|---|---|---|
| committer | totycro <totycro@unknown-horizons.org> | 2012-05-23 10:48:40 +0200 |
| commit | 45cfb83e7a74121f8847f73fdc522f5785470733 (patch) | |
| tree | d48a20522bd844f45ef417a2f9d02fdbc1a8e0f3 | |
| parent | e13cc36c8a2ae63784736cfa7ad6cb0b2ac46572 (diff) | |
| download | ffp-45cfb83e7a74121f8847f73fdc522f5785470733.tar.gz ffp-45cfb83e7a74121f8847f73fdc522f5785470733.tar.bz2 ffp-45cfb83e7a74121f8847f73fdc522f5785470733.zip | |
Minor corrections
| -rw-r--r-- | AufgabeFFP7.hs | 4 | ||||
| -rwxr-xr-x | TestAufgabeFFP7.hs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/AufgabeFFP7.hs b/AufgabeFFP7.hs index e2a7d65..c7f88b7 100644 --- a/AufgabeFFP7.hs +++ b/AufgabeFFP7.hs | |||
| @@ -20,7 +20,7 @@ insert c (cur, buf) = (min (length buf + 1) (max (cur + 1) 1), buf1 ++ [c] ++ bu | |||
| 20 | -- delete character before cursor | 20 | -- delete character before cursor |
| 21 | delete :: Buffer -> Buffer | 21 | delete :: Buffer -> Buffer |
| 22 | delete (cur, buf) | 22 | delete (cur, buf) |
| 23 | | buf2 == "" = (min newCur (length buf1), buf1) | 23 | | buf2 == "" = (max 0 (min newCur (length buf1)), buf1) |
| 24 | | newCur < 0 = (0, buf) | 24 | | newCur < 0 = (0, buf) |
| 25 | | otherwise = (newCur, buf1 ++ tail buf2) | 25 | | otherwise = (newCur, buf1 ++ tail buf2) |
| 26 | where | 26 | where |
| @@ -57,7 +57,7 @@ insertI c (beforeC, afterC) = (c:beforeC, afterC) | |||
| 57 | 57 | ||
| 58 | -- delete character before cursor | 58 | -- delete character before cursor |
| 59 | deleteI :: BufferI -> BufferI | 59 | deleteI :: BufferI -> BufferI |
| 60 | deleteI (beforeC, "") = (beforeC, "") | 60 | deleteI ("", afterC) = ("", afterC) |
| 61 | deleteI (c:beforeC, afterC) = (beforeC, afterC) | 61 | deleteI (c:beforeC, afterC) = (beforeC, afterC) |
| 62 | 62 | ||
| 63 | -- move cursor left one character | 63 | -- move cursor left one character |
diff --git a/TestAufgabeFFP7.hs b/TestAufgabeFFP7.hs index 376e782..00af333 100755 --- a/TestAufgabeFFP7.hs +++ b/TestAufgabeFFP7.hs | |||
| @@ -82,8 +82,8 @@ cases2 = TestLabel "bufferI" $ TestList [ | |||
| 82 | (insertI 'b' ("a", "c")), | 82 | (insertI 'b' ("a", "c")), |
| 83 | 83 | ||
| 84 | TestCase $ assertEqual "deleteI1" ("", "bc") | 84 | TestCase $ assertEqual "deleteI1" ("", "bc") |
| 85 | (deleteI ("", "abc")), | 85 | (deleteI ("", "bc")), |
| 86 | TestCase $ assertEqual "deleteI2" ("cba", "") | 86 | TestCase $ assertEqual "deleteI2" ("ba", "") |
| 87 | (deleteI ("cba", "")), | 87 | (deleteI ("cba", "")), |
| 88 | TestCase $ assertEqual "deleteI3" ("", "") | 88 | TestCase $ assertEqual "deleteI3" ("", "") |
| 89 | (deleteI ("", "")), | 89 | (deleteI ("", "")), |