Changeset f988834 for tests/collections

Timestamp:

Jan 19, 2024, 2:44:41 AM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

ac939461

Parents:

59c8dff (diff), e8b3717 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

tests/collections

Files:

• .expect/string-api-coverage.txt (modified) (2 diffs)
• .expect/string-compare.txt (modified) (114 diffs)
• .expect/string-istream-manip.txt (modified) (2 diffs)
• string-api-coverage.cfa (modified) (9 diffs)
• string-compare.cfa (modified) (3 diffs)
• string-overwrite.cfa (modified) (4 diffs)

tests/collections/.expect/string-api-coverage.txt

@@ -14 +14 @@
 true false
 true false
+1234567
 123
 hello
+hell
 hello
 world
 hello
 world
+Q
+1234567
+hello
+Q
+123
+hell
+1234567
+hello
+123
+hell
 5
 helloworld
@@ -29 +41 @@
 hello, friend
 bye, friend
+ohello
+ohell
+ohell
+omydarling
+omy
+omy
+hellohellohellohello
 hellohellohello
 QQQ
 asdfasdfasdf
+lo
+hello heliocentric
 e
 help!!!o

tests/collections/.expect/string-compare.txt

@@ -1 +1 @@
 ------- string -------
-(cmp(s_, s_) == 0) ok
+(strcmp(s_, s_) == 0) ok
 (s_ == s_) ok
 !(s_ != s_) ok
@@ -7 +7 @@
 (s_ <= s_) ok
 !(s_ < s_) ok
-(cmp("", s_) == 0) ok
+(strcmp("", s_) == 0) ok
 ("" == s_) ok
 !("" != s_) ok
@@ -14 +14 @@
 ("" <= s_) ok
 !("" < s_) ok
-(cmp(s_, "") == 0) ok
+(strcmp(s_, "") == 0) ok
 (s_ == "") ok
 !(s_ != "") ok
@@ -21 +21 @@
 (s_ <= "") ok
 !(s_ < "") ok
-(cmp(s_, s_a) < 0) ok
+(strcmp(s_, s_a) < 0) ok
 !(s_ == s_a) ok
 (s_ != s_a) ok
@@ -28 +28 @@
 (s_ <= s_a) ok
 (s_ < s_a) ok
-(cmp("", s_a) < 0) ok
+(strcmp("", s_a) < 0) ok
 !("" == s_a) ok
 ("" != s_a) ok
@@ -35 +35 @@
 ("" <= s_a) ok
 ("" < s_a) ok
-(cmp(s_, "a") < 0) ok
+(strcmp(s_, "a") < 0) ok
 !(s_ == "a") ok
 (s_ != "a") ok
@@ -42 +42 @@
 (s_ <= "a") ok
 (s_ < "a") ok
-(cmp(s_a, s_) > 0) ok
+(strcmp(s_a, s_) > 0) ok
 !(s_a == s_) ok
 (s_a != s_) ok
@@ -49 +49 @@
 !(s_a <= s_) ok
 !(s_a < s_) ok
-(cmp("a", s_) > 0) ok
+(strcmp("a", s_) > 0) ok
 !("a" == s_) ok
 ("a" != s_) ok
@@ -56 +56 @@
 !("a" <= s_) ok
 !("a" < s_) ok
-(cmp(s_a, "") > 0) ok
+(strcmp(s_a, "") > 0) ok
 !(s_a == "") ok
 (s_a != "") ok
@@ -63 +63 @@
 !(s_a <= "") ok
 !(s_a < "") ok
-(cmp(s_, s_aa) < 0) ok
+(strcmp(s_, s_aa) < 0) ok
 !(s_ == s_aa) ok
 (s_ != s_aa) ok
@@ -70 +70 @@
 (s_ <= s_aa) ok
 (s_ < s_aa) ok
-(cmp("", s_aa) < 0) ok
+(strcmp("", s_aa) < 0) ok
 !("" == s_aa) ok
 ("" != s_aa) ok
@@ -77 +77 @@
 ("" <= s_aa) ok
 ("" < s_aa) ok
-(cmp(s_, "aa") < 0) ok
+(strcmp(s_, "aa") < 0) ok
 !(s_ == "aa") ok
 (s_ != "aa") ok
@@ -84 +84 @@
 (s_ <= "aa") ok
 (s_ < "aa") ok
-(cmp(s_aa, s_) > 0) ok
+(strcmp(s_aa, s_) > 0) ok
 !(s_aa == s_) ok
 (s_aa != s_) ok
@@ -91 +91 @@
 !(s_aa <= s_) ok
 !(s_aa < s_) ok
-(cmp("aa", s_) > 0) ok
+(strcmp("aa", s_) > 0) ok
 !("aa" == s_) ok
 ("aa" != s_) ok
@@ -98 +98 @@
 !("aa" <= s_) ok
 !("aa" < s_) ok
-(cmp(s_aa, "") > 0) ok
+(strcmp(s_aa, "") > 0) ok
 !(s_aa == "") ok
 (s_aa != "") ok
@@ -105 +105 @@
 !(s_aa <= "") ok
 !(s_aa < "") ok
-(cmp(s_a, s_aa) < 0) ok
+(strcmp(s_a, s_aa) < 0) ok
 !(s_a == s_aa) ok
 (s_a != s_aa) ok
@@ -112 +112 @@
 (s_a <= s_aa) ok
 (s_a < s_aa) ok
-(cmp("a", s_aa) < 0) ok
+(strcmp("a", s_aa) < 0) ok
 !("a" == s_aa) ok
 ("a" != s_aa) ok
@@ -119 +119 @@
 ("a" <= s_aa) ok
 ("a" < s_aa) ok
-(cmp(s_a, "aa") < 0) ok
+(strcmp(s_a, "aa") < 0) ok
 !(s_a == "aa") ok
 (s_a != "aa") ok
@@ -126 +126 @@
 (s_a <= "aa") ok
 (s_a < "aa") ok
-(cmp(s_aa, s_a) > 0) ok
+(strcmp(s_aa, s_a) > 0) ok
 !(s_aa == s_a) ok
 (s_aa != s_a) ok
@@ -133 +133 @@
 !(s_aa <= s_a) ok
 !(s_aa < s_a) ok
-(cmp("aa", s_a) > 0) ok
+(strcmp("aa", s_a) > 0) ok
 !("aa" == s_a) ok
 ("aa" != s_a) ok
@@ -140 +140 @@
 !("aa" <= s_a) ok
 !("aa" < s_a) ok
-(cmp(s_aa, "a") > 0) ok
+(strcmp(s_aa, "a") > 0) ok
 !(s_aa == "a") ok
 (s_aa != "a") ok
@@ -147 +147 @@
 !(s_aa <= "a") ok
 !(s_aa < "a") ok
-(cmp(s_a, s_a) == 0) ok
+(strcmp(s_a, s_a) == 0) ok
 (s_a == s_a) ok
 !(s_a != s_a) ok
@@ -154 +154 @@
 (s_a <= s_a) ok
 !(s_a < s_a) ok
-(cmp("a", s_a) == 0) ok
+(strcmp("a", s_a) == 0) ok
 ("a" == s_a) ok
 !("a" != s_a) ok
@@ -161 +161 @@
 ("a" <= s_a) ok
 !("a" < s_a) ok
-(cmp(s_a, "a") == 0) ok
+(strcmp(s_a, "a") == 0) ok
 (s_a == "a") ok
 !(s_a != "a") ok
@@ -168 +168 @@
 (s_a <= "a") ok
 !(s_a < "a") ok
-(cmp(s_aa, s_aa) == 0) ok
+(strcmp(s_aa, s_aa) == 0) ok
 (s_aa == s_aa) ok
 !(s_aa != s_aa) ok
@@ -175 +175 @@
 (s_aa <= s_aa) ok
 !(s_aa < s_aa) ok
-(cmp("aa", s_aa) == 0) ok
+(strcmp("aa", s_aa) == 0) ok
 ("aa" == s_aa) ok
 !("aa" != s_aa) ok
@@ -182 +182 @@
 ("aa" <= s_aa) ok
 !("aa" < s_aa) ok
-(cmp(s_aa, "aa") == 0) ok
+(strcmp(s_aa, "aa") == 0) ok
 (s_aa == "aa") ok
 !(s_aa != "aa") ok
@@ -189 +189 @@
 (s_aa <= "aa") ok
 !(s_aa < "aa") ok
-(cmp(s_a, s_b) < 0) ok
+(strcmp(s_a, s_b) < 0) ok
 !(s_a == s_b) ok
 (s_a != s_b) ok
@@ -196 +196 @@
 (s_a <= s_b) ok
 (s_a < s_b) ok
-(cmp("a", s_b) < 0) ok
+(strcmp("a", s_b) < 0) ok
 !("a" == s_b) ok
 ("a" != s_b) ok
@@ -203 +203 @@
 ("a" <= s_b) ok
 ("a" < s_b) ok
-(cmp(s_a, "b") < 0) ok
+(strcmp(s_a, "b") < 0) ok
 !(s_a == "b") ok
 (s_a != "b") ok
@@ -210 +210 @@
 (s_a <= "b") ok
 (s_a < "b") ok
-(cmp(s_b, s_a) > 0) ok
+(strcmp(s_b, s_a) > 0) ok
 !(s_b == s_a) ok
 (s_b != s_a) ok
@@ -217 +217 @@
 !(s_b <= s_a) ok
 !(s_b < s_a) ok
-(cmp("b", s_a) > 0) ok
+(strcmp("b", s_a) > 0) ok
 !("b" == s_a) ok
 ("b" != s_a) ok
@@ -224 +224 @@
 !("b" <= s_a) ok
 !("b" < s_a) ok
-(cmp(s_b, "a") > 0) ok
+(strcmp(s_b, "a") > 0) ok
 !(s_b == "a") ok
 (s_b != "a") ok
@@ -231 +231 @@
 !(s_b <= "a") ok
 !(s_b < "a") ok
-(cmp(s_a, s_ba) < 0) ok
+(strcmp(s_a, s_ba) < 0) ok
 !(s_a == s_ba) ok
 (s_a != s_ba) ok
@@ -238 +238 @@
 (s_a <= s_ba) ok
 (s_a < s_ba) ok
-(cmp("a", s_ba) < 0) ok
+(strcmp("a", s_ba) < 0) ok
 !("a" == s_ba) ok
 ("a" != s_ba) ok
@@ -245 +245 @@
 ("a" <= s_ba) ok
 ("a" < s_ba) ok
-(cmp(s_a, "ba") < 0) ok
+(strcmp(s_a, "ba") < 0) ok
 !(s_a == "ba") ok
 (s_a != "ba") ok
@@ -252 +252 @@
 (s_a <= "ba") ok
 (s_a < "ba") ok
-(cmp(s_ba, s_a) > 0) ok
+(strcmp(s_ba, s_a) > 0) ok
 !(s_ba == s_a) ok
 (s_ba != s_a) ok
@@ -259 +259 @@
 !(s_ba <= s_a) ok
 !(s_ba < s_a) ok
-(cmp("ba", s_a) > 0) ok
+(strcmp("ba", s_a) > 0) ok
 !("ba" == s_a) ok
 ("ba" != s_a) ok
@@ -266 +266 @@
 !("ba" <= s_a) ok
 !("ba" < s_a) ok
-(cmp(s_ba, "a") > 0) ok
+(strcmp(s_ba, "a") > 0) ok
 !(s_ba == "a") ok
 (s_ba != "a") ok
@@ -273 +273 @@
 !(s_ba <= "a") ok
 !(s_ba < "a") ok
-(cmp(s_aa, s_ab) < 0) ok
+(strcmp(s_aa, s_ab) < 0) ok
 !(s_aa == s_ab) ok
 (s_aa != s_ab) ok
@@ -280 +280 @@
 (s_aa <= s_ab) ok
 (s_aa < s_ab) ok
-(cmp("aa", s_ab) < 0) ok
+(strcmp("aa", s_ab) < 0) ok
 !("aa" == s_ab) ok
 ("aa" != s_ab) ok
@@ -287 +287 @@
 ("aa" <= s_ab) ok
 ("aa" < s_ab) ok
-(cmp(s_aa, "ab") < 0) ok
+(strcmp(s_aa, "ab") < 0) ok
 !(s_aa == "ab") ok
 (s_aa != "ab") ok
@@ -294 +294 @@
 (s_aa <= "ab") ok
 (s_aa < "ab") ok
-(cmp(s_ab, s_aa) > 0) ok
+(strcmp(s_ab, s_aa) > 0) ok
 !(s_ab == s_aa) ok
 (s_ab != s_aa) ok
@@ -301 +301 @@
 !(s_ab <= s_aa) ok
 !(s_ab < s_aa) ok
-(cmp("ab", s_aa) > 0) ok
+(strcmp("ab", s_aa) > 0) ok
 !("ab" == s_aa) ok
 ("ab" != s_aa) ok
@@ -308 +308 @@
 !("ab" <= s_aa) ok
 !("ab" < s_aa) ok
-(cmp(s_ab, "aa") > 0) ok
+(strcmp(s_ab, "aa") > 0) ok
 !(s_ab == "aa") ok
 (s_ab != "aa") ok
@@ -315 +315 @@
 !(s_ab <= "aa") ok
 !(s_ab < "aa") ok
-(cmp(s_ba, s_bb) < 0) ok
+(strcmp(s_ba, s_bb) < 0) ok
 !(s_ba == s_bb) ok
 (s_ba != s_bb) ok
@@ -322 +322 @@
 (s_ba <= s_bb) ok
 (s_ba < s_bb) ok
-(cmp("ba", s_bb) < 0) ok
+(strcmp("ba", s_bb) < 0) ok
 !("ba" == s_bb) ok
 ("ba" != s_bb) ok
@@ -329 +329 @@
 ("ba" <= s_bb) ok
 ("ba" < s_bb) ok
-(cmp(s_ba, "bb") < 0) ok
+(strcmp(s_ba, "bb") < 0) ok
 !(s_ba == "bb") ok
 (s_ba != "bb") ok
@@ -336 +336 @@
 (s_ba <= "bb") ok
 (s_ba < "bb") ok
-(cmp(s_bb, s_ba) > 0) ok
+(strcmp(s_bb, s_ba) > 0) ok
 !(s_bb == s_ba) ok
 (s_bb != s_ba) ok
@@ -343 +343 @@
 !(s_bb <= s_ba) ok
 !(s_bb < s_ba) ok
-(cmp("bb", s_ba) > 0) ok
+(strcmp("bb", s_ba) > 0) ok
 !("bb" == s_ba) ok
 ("bb" != s_ba) ok
@@ -350 +350 @@
 !("bb" <= s_ba) ok
 !("bb" < s_ba) ok
-(cmp(s_bb, "ba") > 0) ok
+(strcmp(s_bb, "ba") > 0) ok
 !(s_bb == "ba") ok
 (s_bb != "ba") ok
@@ -357 +357 @@
 !(s_bb <= "ba") ok
 !(s_bb < "ba") ok
-(cmp(s_aa, s_b) < 0) ok
+(strcmp(s_aa, s_b) < 0) ok
 !(s_aa == s_b) ok
 (s_aa != s_b) ok
@@ -364 +364 @@
 (s_aa <= s_b) ok
 (s_aa < s_b) ok
-(cmp("aa", s_b) < 0) ok
+(strcmp("aa", s_b) < 0) ok
 !("aa" == s_b) ok
 ("aa" != s_b) ok
@@ -371 +371 @@
 ("aa" <= s_b) ok
 ("aa" < s_b) ok
-(cmp(s_aa, "b") < 0) ok
+(strcmp(s_aa, "b") < 0) ok
 !(s_aa == "b") ok
 (s_aa != "b") ok
@@ -378 +378 @@
 (s_aa <= "b") ok
 (s_aa < "b") ok
-(cmp(s_b, s_aa) > 0) ok
+(strcmp(s_b, s_aa) > 0) ok
 !(s_b == s_aa) ok
 (s_b != s_aa) ok
@@ -385 +385 @@
 !(s_b <= s_aa) ok
 !(s_b < s_aa) ok
-(cmp("b", s_aa) > 0) ok
+(strcmp("b", s_aa) > 0) ok
 !("b" == s_aa) ok
 ("b" != s_aa) ok
@@ -392 +392 @@
 !("b" <= s_aa) ok
 !("b" < s_aa) ok
-(cmp(s_b, "aa") > 0) ok
+(strcmp(s_b, "aa") > 0) ok
 !(s_b == "aa") ok
 (s_b != "aa") ok
@@ -400 +400 @@
 !(s_b < "aa") ok
 ------- string_res -------
-(cmp(s_, s_) == 0) ok
+(strcmp(s_, s_) == 0) ok
 (s_ == s_) ok
 !(s_ != s_) ok
@@ -407 +407 @@
 (s_ <= s_) ok
 !(s_ < s_) ok
-(cmp("", s_) == 0) ok
+(strcmp("", s_) == 0) ok
 ("" == s_) ok
 !("" != s_) ok
@@ -414 +414 @@
 ("" <= s_) ok
 !("" < s_) ok
-(cmp(s_, "") == 0) ok
+(strcmp(s_, "") == 0) ok
 (s_ == "") ok
 !(s_ != "") ok
@@ -421 +421 @@
 (s_ <= "") ok
 !(s_ < "") ok
-(cmp(s_, s_a) < 0) ok
+(strcmp(s_, s_a) < 0) ok
 !(s_ == s_a) ok
 (s_ != s_a) ok
@@ -428 +428 @@
 (s_ <= s_a) ok
 (s_ < s_a) ok
-(cmp("", s_a) < 0) ok
+(strcmp("", s_a) < 0) ok
 !("" == s_a) ok
 ("" != s_a) ok
@@ -435 +435 @@
 ("" <= s_a) ok
 ("" < s_a) ok
-(cmp(s_, "a") < 0) ok
+(strcmp(s_, "a") < 0) ok
 !(s_ == "a") ok
 (s_ != "a") ok
@@ -442 +442 @@
 (s_ <= "a") ok
 (s_ < "a") ok
-(cmp(s_a, s_) > 0) ok
+(strcmp(s_a, s_) > 0) ok
 !(s_a == s_) ok
 (s_a != s_) ok
@@ -449 +449 @@
 !(s_a <= s_) ok
 !(s_a < s_) ok
-(cmp("a", s_) > 0) ok
+(strcmp("a", s_) > 0) ok
 !("a" == s_) ok
 ("a" != s_) ok
@@ -456 +456 @@
 !("a" <= s_) ok
 !("a" < s_) ok
-(cmp(s_a, "") > 0) ok
+(strcmp(s_a, "") > 0) ok
 !(s_a == "") ok
 (s_a != "") ok
@@ -463 +463 @@
 !(s_a <= "") ok
 !(s_a < "") ok
-(cmp(s_, s_aa) < 0) ok
+(strcmp(s_, s_aa) < 0) ok
 !(s_ == s_aa) ok
 (s_ != s_aa) ok
@@ -470 +470 @@
 (s_ <= s_aa) ok
 (s_ < s_aa) ok
-(cmp("", s_aa) < 0) ok
+(strcmp("", s_aa) < 0) ok
 !("" == s_aa) ok
 ("" != s_aa) ok
@@ -477 +477 @@
 ("" <= s_aa) ok
 ("" < s_aa) ok
-(cmp(s_, "aa") < 0) ok
+(strcmp(s_, "aa") < 0) ok
 !(s_ == "aa") ok
 (s_ != "aa") ok
@@ -484 +484 @@
 (s_ <= "aa") ok
 (s_ < "aa") ok
-(cmp(s_aa, s_) > 0) ok
+(strcmp(s_aa, s_) > 0) ok
 !(s_aa == s_) ok
 (s_aa != s_) ok
@@ -491 +491 @@
 !(s_aa <= s_) ok
 !(s_aa < s_) ok
-(cmp("aa", s_) > 0) ok
+(strcmp("aa", s_) > 0) ok
 !("aa" == s_) ok
 ("aa" != s_) ok
@@ -498 +498 @@
 !("aa" <= s_) ok
 !("aa" < s_) ok
-(cmp(s_aa, "") > 0) ok
+(strcmp(s_aa, "") > 0) ok
 !(s_aa == "") ok
 (s_aa != "") ok
@@ -505 +505 @@
 !(s_aa <= "") ok
 !(s_aa < "") ok
-(cmp(s_a, s_aa) < 0) ok
+(strcmp(s_a, s_aa) < 0) ok
 !(s_a == s_aa) ok
 (s_a != s_aa) ok
@@ -512 +512 @@
 (s_a <= s_aa) ok
 (s_a < s_aa) ok
-(cmp("a", s_aa) < 0) ok
+(strcmp("a", s_aa) < 0) ok
 !("a" == s_aa) ok
 ("a" != s_aa) ok
@@ -519 +519 @@
 ("a" <= s_aa) ok
 ("a" < s_aa) ok
-(cmp(s_a, "aa") < 0) ok
+(strcmp(s_a, "aa") < 0) ok
 !(s_a == "aa") ok
 (s_a != "aa") ok
@@ -526 +526 @@
 (s_a <= "aa") ok
 (s_a < "aa") ok
-(cmp(s_aa, s_a) > 0) ok
+(strcmp(s_aa, s_a) > 0) ok
 !(s_aa == s_a) ok
 (s_aa != s_a) ok
@@ -533 +533 @@
 !(s_aa <= s_a) ok
 !(s_aa < s_a) ok
-(cmp("aa", s_a) > 0) ok
+(strcmp("aa", s_a) > 0) ok
 !("aa" == s_a) ok
 ("aa" != s_a) ok
@@ -540 +540 @@
 !("aa" <= s_a) ok
 !("aa" < s_a) ok
-(cmp(s_aa, "a") > 0) ok
+(strcmp(s_aa, "a") > 0) ok
 !(s_aa == "a") ok
 (s_aa != "a") ok
@@ -547 +547 @@
 !(s_aa <= "a") ok
 !(s_aa < "a") ok
-(cmp(s_a, s_a) == 0) ok
+(strcmp(s_a, s_a) == 0) ok
 (s_a == s_a) ok
 !(s_a != s_a) ok
@@ -554 +554 @@
 (s_a <= s_a) ok
 !(s_a < s_a) ok
-(cmp("a", s_a) == 0) ok
+(strcmp("a", s_a) == 0) ok
 ("a" == s_a) ok
 !("a" != s_a) ok
@@ -561 +561 @@
 ("a" <= s_a) ok
 !("a" < s_a) ok
-(cmp(s_a, "a") == 0) ok
+(strcmp(s_a, "a") == 0) ok
 (s_a == "a") ok
 !(s_a != "a") ok
@@ -568 +568 @@
 (s_a <= "a") ok
 !(s_a < "a") ok
-(cmp(s_aa, s_aa) == 0) ok
+(strcmp(s_aa, s_aa) == 0) ok
 (s_aa == s_aa) ok
 !(s_aa != s_aa) ok
@@ -575 +575 @@
 (s_aa <= s_aa) ok
 !(s_aa < s_aa) ok
-(cmp("aa", s_aa) == 0) ok
+(strcmp("aa", s_aa) == 0) ok
 ("aa" == s_aa) ok
 !("aa" != s_aa) ok
@@ -582 +582 @@
 ("aa" <= s_aa) ok
 !("aa" < s_aa) ok
-(cmp(s_aa, "aa") == 0) ok
+(strcmp(s_aa, "aa") == 0) ok
 (s_aa == "aa") ok
 !(s_aa != "aa") ok
@@ -589 +589 @@
 (s_aa <= "aa") ok
 !(s_aa < "aa") ok
-(cmp(s_a, s_b) < 0) ok
+(strcmp(s_a, s_b) < 0) ok
 !(s_a == s_b) ok
 (s_a != s_b) ok
@@ -596 +596 @@
 (s_a <= s_b) ok
 (s_a < s_b) ok
-(cmp("a", s_b) < 0) ok
+(strcmp("a", s_b) < 0) ok
 !("a" == s_b) ok
 ("a" != s_b) ok
@@ -603 +603 @@
 ("a" <= s_b) ok
 ("a" < s_b) ok
-(cmp(s_a, "b") < 0) ok
+(strcmp(s_a, "b") < 0) ok
 !(s_a == "b") ok
 (s_a != "b") ok
@@ -610 +610 @@
 (s_a <= "b") ok
 (s_a < "b") ok
-(cmp(s_b, s_a) > 0) ok
+(strcmp(s_b, s_a) > 0) ok
 !(s_b == s_a) ok
 (s_b != s_a) ok
@@ -617 +617 @@
 !(s_b <= s_a) ok
 !(s_b < s_a) ok
-(cmp("b", s_a) > 0) ok
+(strcmp("b", s_a) > 0) ok
 !("b" == s_a) ok
 ("b" != s_a) ok
@@ -624 +624 @@
 !("b" <= s_a) ok
 !("b" < s_a) ok
-(cmp(s_b, "a") > 0) ok
+(strcmp(s_b, "a") > 0) ok
 !(s_b == "a") ok
 (s_b != "a") ok
@@ -631 +631 @@
 !(s_b <= "a") ok
 !(s_b < "a") ok
-(cmp(s_a, s_ba) < 0) ok
+(strcmp(s_a, s_ba) < 0) ok
 !(s_a == s_ba) ok
 (s_a != s_ba) ok
@@ -638 +638 @@
 (s_a <= s_ba) ok
 (s_a < s_ba) ok
-(cmp("a", s_ba) < 0) ok
+(strcmp("a", s_ba) < 0) ok
 !("a" == s_ba) ok
 ("a" != s_ba) ok
@@ -645 +645 @@
 ("a" <= s_ba) ok
 ("a" < s_ba) ok
-(cmp(s_a, "ba") < 0) ok
+(strcmp(s_a, "ba") < 0) ok
 !(s_a == "ba") ok
 (s_a != "ba") ok
@@ -652 +652 @@
 (s_a <= "ba") ok
 (s_a < "ba") ok
-(cmp(s_ba, s_a) > 0) ok
+(strcmp(s_ba, s_a) > 0) ok
 !(s_ba == s_a) ok
 (s_ba != s_a) ok
@@ -659 +659 @@
 !(s_ba <= s_a) ok
 !(s_ba < s_a) ok
-(cmp("ba", s_a) > 0) ok
+(strcmp("ba", s_a) > 0) ok
 !("ba" == s_a) ok
 ("ba" != s_a) ok
@@ -666 +666 @@
 !("ba" <= s_a) ok
 !("ba" < s_a) ok
-(cmp(s_ba, "a") > 0) ok
+(strcmp(s_ba, "a") > 0) ok
 !(s_ba == "a") ok
 (s_ba != "a") ok
@@ -673 +673 @@
 !(s_ba <= "a") ok
 !(s_ba < "a") ok
-(cmp(s_aa, s_ab) < 0) ok
+(strcmp(s_aa, s_ab) < 0) ok
 !(s_aa == s_ab) ok
 (s_aa != s_ab) ok
@@ -680 +680 @@
 (s_aa <= s_ab) ok
 (s_aa < s_ab) ok
-(cmp("aa", s_ab) < 0) ok
+(strcmp("aa", s_ab) < 0) ok
 !("aa" == s_ab) ok
 ("aa" != s_ab) ok
@@ -687 +687 @@
 ("aa" <= s_ab) ok
 ("aa" < s_ab) ok
-(cmp(s_aa, "ab") < 0) ok
+(strcmp(s_aa, "ab") < 0) ok
 !(s_aa == "ab") ok
 (s_aa != "ab") ok
@@ -694 +694 @@
 (s_aa <= "ab") ok
 (s_aa < "ab") ok
-(cmp(s_ab, s_aa) > 0) ok
+(strcmp(s_ab, s_aa) > 0) ok
 !(s_ab == s_aa) ok
 (s_ab != s_aa) ok
@@ -701 +701 @@
 !(s_ab <= s_aa) ok
 !(s_ab < s_aa) ok
-(cmp("ab", s_aa) > 0) ok
+(strcmp("ab", s_aa) > 0) ok
 !("ab" == s_aa) ok
 ("ab" != s_aa) ok
@@ -708 +708 @@
 !("ab" <= s_aa) ok
 !("ab" < s_aa) ok
-(cmp(s_ab, "aa") > 0) ok
+(strcmp(s_ab, "aa") > 0) ok
 !(s_ab == "aa") ok
 (s_ab != "aa") ok
@@ -715 +715 @@
 !(s_ab <= "aa") ok
 !(s_ab < "aa") ok
-(cmp(s_ba, s_bb) < 0) ok
+(strcmp(s_ba, s_bb) < 0) ok
 !(s_ba == s_bb) ok
 (s_ba != s_bb) ok
@@ -722 +722 @@
 (s_ba <= s_bb) ok
 (s_ba < s_bb) ok
-(cmp("ba", s_bb) < 0) ok
+(strcmp("ba", s_bb) < 0) ok
 !("ba" == s_bb) ok
 ("ba" != s_bb) ok
@@ -729 +729 @@
 ("ba" <= s_bb) ok
 ("ba" < s_bb) ok
-(cmp(s_ba, "bb") < 0) ok
+(strcmp(s_ba, "bb") < 0) ok
 !(s_ba == "bb") ok
 (s_ba != "bb") ok
@@ -736 +736 @@
 (s_ba <= "bb") ok
 (s_ba < "bb") ok
-(cmp(s_bb, s_ba) > 0) ok
+(strcmp(s_bb, s_ba) > 0) ok
 !(s_bb == s_ba) ok
 (s_bb != s_ba) ok
@@ -743 +743 @@
 !(s_bb <= s_ba) ok
 !(s_bb < s_ba) ok
-(cmp("bb", s_ba) > 0) ok
+(strcmp("bb", s_ba) > 0) ok
 !("bb" == s_ba) ok
 ("bb" != s_ba) ok
@@ -750 +750 @@
 !("bb" <= s_ba) ok
 !("bb" < s_ba) ok
-(cmp(s_bb, "ba") > 0) ok
+(strcmp(s_bb, "ba") > 0) ok
 !(s_bb == "ba") ok
 (s_bb != "ba") ok
@@ -757 +757 @@
 !(s_bb <= "ba") ok
 !(s_bb < "ba") ok
-(cmp(s_aa, s_b) < 0) ok
+(strcmp(s_aa, s_b) < 0) ok
 !(s_aa == s_b) ok
 (s_aa != s_b) ok
@@ -764 +764 @@
 (s_aa <= s_b) ok
 (s_aa < s_b) ok
-(cmp("aa", s_b) < 0) ok
+(strcmp("aa", s_b) < 0) ok
 !("aa" == s_b) ok
 ("aa" != s_b) ok
@@ -771 +771 @@
 ("aa" <= s_b) ok
 ("aa" < s_b) ok
-(cmp(s_aa, "b") < 0) ok
+(strcmp(s_aa, "b") < 0) ok
 !(s_aa == "b") ok
 (s_aa != "b") ok
@@ -778 +778 @@
 (s_aa <= "b") ok
 (s_aa < "b") ok
-(cmp(s_b, s_aa) > 0) ok
+(strcmp(s_b, s_aa) > 0) ok
 !(s_b == s_aa) ok
 (s_b != s_aa) ok
@@ -785 +785 @@
 !(s_b <= s_aa) ok
 !(s_b < s_aa) ok
-(cmp("b", s_aa) > 0) ok
+(strcmp("b", s_aa) > 0) ok
 !("b" == s_aa) ok
 ("b" != s_aa) ok
@@ -792 +792 @@
 !("b" <= s_aa) ok
 !("b" < s_aa) ok
-(cmp(s_b, "aa") > 0) ok
+(strcmp(s_b, "aa") > 0) ok
 !(s_b == "aa") ok
 (s_b != "aa") ok

tests/collections/.expect/string-istream-manip.txt

@@ -69 +69 @@
 13 wwwwwwww
 14 cccc
-15 q
+15 
 1 yyyyyyyyyyyyyyyyyyyy
 2 abcxxx
@@ -84 +84 @@
 13 wwwwwwww
 14 cccc
-15 q
+15 

tests/collections/string-api-coverage.cfa

@@ -51 +51 @@
     sout | (s == "hello") | (s == "world");
     sout | (s != "world") | (s != "hello");
-    sout | ( frag == s(1,4) ) | ( s3   == s(1,4) );
-    sout | ( s3   != s(1,4) ) | ( frag != s(1,4) );
-    sout | ( s2(1,4) == s(1,4) ) | ( s3(1,4)   == s(1,4) );
-    sout | ( s3(1,4) != s(1,4) ) | ( s2(1,4)   != s(1,4) );
-    sout | ( s(1,4) == frag ) | ( s(1,4) == s3   );
-    sout | ( s(1,4) != s3   ) | ( s(1,4) != frag );
-    sout | ( s(1,4) == "ell"   ) | ( s(1,4) == "world" );
-    sout | ( s(1,4) != "world" ) | ( s(1,4) != "ell"   );
+    sout | ( frag == s(1,3) ) | ( s3   == s(1,3) );
+    sout | ( s3   != s(1,3) ) | ( frag != s(1,3) );
+    sout | ( s2(1,3) == s(1,3) ) | ( s3(1,3)   == s(1,3) );
+    sout | ( s3(1,3) != s(1,3) ) | ( s2(1,3)   != s(1,3) );
+    sout | ( s(1,3) == frag ) | ( s(1,3) == s3   );
+    sout | ( s(1,3) != s3   ) | ( s(1,3) != frag );
+    sout | ( s(1,3) == "ell"   ) | ( s(1,3) == "world" );
+    sout | ( s(1,3) != "world" ) | ( s(1,3) != "ell"   );
 
 
@@ -66 +66 @@
     //
     {
-        string b1 = { "1234567", 3 };
-        sout | b1; // 123
+        string b1 = "1234567";
+        sout | b1; // 1234567
+
+        string b1x = { "1234567", 3 };
+        sout | b1x; // 123
 
         string b2 = s;
         sout | b2; // hello
+
+        string b2x = { s, 4 };
+        sout | b2x; // hell
 
         // todo: a plain string &
@@ -88 +94 @@
         b4 = s_constref;
         sout | b4;  // world
+
+        string b5 = 'Q';
+        sout | b5; // Q
+
+
     }
                                             assertWellFormedHandleList( 10 );
+    //
+    // Assignments
+    //
+    {
+        string b = "xxx";
+
+        b = "1234567";
+        sout | b; // 1234567
+
+        b = "xxx";
+        b = s;
+        sout | b; // hello
+        
+        b = "xxx";
+        b = 'Q';
+        sout | b; // Q
+        
+        b = "xxx";
+        assign( b, "1234567", 3 );
+        sout | b; // 123
+
+        b = "xxx";
+        assign( b, s, 4 );
+        sout | b; // hell
+
+        b = "xxx";
+        strcpy(b, "1234567");
+        sout | b; // 1234567
+
+        b = "xxx";
+        strcpy(b, s);
+        sout | b; // hello
+        
+        b = "xxx";
+        strncpy( b, "1234567", 3 );
+        sout | b; // 123
+
+        b = "xxx";
+        strncpy( b, s, 4 );
+        sout | b; // hell
+    }
+                                            assertWellFormedHandleList( 10 );
+
+
 
     sout | size(s); // 5
@@ -126 +181 @@
     sout | sx; // bye, friend
 
+    sx = "o";
+    strcat( sx, s );
+    sout | sx; // ohello
+
+    sx = "o";
+    append( sx, s, 4 );
+    sout | sx; // ohell
+
+    sx = "o";
+    strncat( sx, s, 4 );
+    sout | sx; // ohell
+
+    sx = "o";
+    strcat( sx, "mydarling" );
+    sout | sx; // omydarling
+
+    sx = "o";
+    append( sx, "mydarling", 2 );
+    sout | sx; // omy
+
+    sx = "o";
+    strncat( sx, "mydarling", 2 );
+    sout | sx; // omy
+
     //
     // repetition
     //
+
+    sx = s;
+    sx *= 4;
+    sout | sx; // hellohellohellohello
+
     sx = s * 3;
     sout | sx; // hellohellohello
@@ -142 +226 @@
     //
 
-    //...
+    // Range cases treated thoroughly in "string-overwrite" test.
+    // Composability with comparison and search are demoed above and below.
+    // Coverage here adds the single-argument ("rest of string") overload.
+
+    sx = s;
+    sout | sx(3); // lo
+    sx(3) = "iocentric";
+    sout | s | sx; // hello heliocentric
 
     //
@@ -244 +335 @@
         | find( alphabet        , "def")  // 3
         | find( alphabet( 0, 26), "def")  // 3
-        | find( alphabet( 2, 26), "def")  // 1
-        | find( alphabet( 3, 26), "def")  // 0
-        | find( alphabet( 4, 26), "def")  // 22, not found
-        | find( alphabet( 4, 26),  "ef")  // 0
+        | find( alphabet( 2, 24), "def")  // 1
+        | find( alphabet( 3, 23), "def")  // 0
+        | find( alphabet( 4, 22), "def")  // 22, not found
+        | find( alphabet( 4, 22),  "ef")  // 0
         | find( alphabet( 0,  6), "def")  // 3
         | find( alphabet( 0,  5), "def")  // 5, not found
@@ -255 +346 @@
         | includes( alphabet        , "def")  // true
         | includes( alphabet( 0, 26), "def")  // true
-        | includes( alphabet( 2, 26), "def")  // true
-        | includes( alphabet( 3, 26), "def")  // true
-        | includes( alphabet( 4, 26), "def")  // false
-        | includes( alphabet( 4, 26),  "ef")  // true
+        | includes( alphabet( 2, 24), "def")  // true
+        | includes( alphabet( 3, 23), "def")  // true
+        | includes( alphabet( 4, 22), "def")  // false
+        | includes( alphabet( 4, 22),  "ef")  // true
         | includes( alphabet( 0,  6), "def")  // true
         | includes( alphabet( 0,  5), "def")  // false
@@ -266 +357 @@
         | startsWith( alphabet        , "abc")  // true
         | startsWith( alphabet( 0, 26), "abc")  // true
-        | startsWith( alphabet( 1, 26), "abc")  // false
-        | startsWith( alphabet( 1, 26),  "bc")  // true
+        | startsWith( alphabet( 1, 25), "abc")  // false
+        | startsWith( alphabet( 1, 25),  "bc")  // true
         | startsWith( alphabet( 0, 26), "abc")  // true
         | startsWith( alphabet( 0,  4), "abc")  // true
@@ -281 +372 @@
         | endsWith( alphabet( 0, 25), "xy" )  // true
         | endsWith( alphabet( 0, 26), "xyz")  // true
-        | endsWith( alphabet(23, 26), "xyz")  // true
-        | endsWith( alphabet(24, 26), "xyz")  // false
-        | endsWith( alphabet(24, 26),  "yz")  // true
+        | endsWith( alphabet(23,  3), "xyz")  // true
+        | endsWith( alphabet(24,  2), "xyz")  // false
+        | endsWith( alphabet(24,  2),  "yz")  // true
         | endsWith( alphabet        , "abc"); // false
 

tests/collections/string-compare.cfa

@@ -3 +3 @@
 
 #define test_eq_(l, r) \
-    chk( (cmp(l, r) == 0) ) \
+    chk( (strcmp(l, r) == 0) ) \
     chk(  (l == r) ) \
     chk( !(l != r) ) \
@@ -17 +17 @@
 
 #define test_lt_(l, r) \
-    chk( (cmp(l, r) < 0) ) \
+    chk( (strcmp(l, r) < 0) ) \
     chk( !(l == r) ) \
     chk(  (l != r) ) \
@@ -26 +26 @@
 
 #define test_gt_(l, r) \
-    chk( (cmp(l, r) > 0) ) \
+    chk( (strcmp(l, r) > 0) ) \
     chk( !(l == r) ) \
     chk(  (l != r) ) \

tests/collections/string-overwrite.cfa

@@ -9 +9 @@
 MS = modifier start
 ME = modifier end
+ML = modifier length
 WS = witness start
 WE = witness end
+WL = witness length
 
 The test does:
@@ -71 +73 @@
 
 
-void showOneReplacement(string & s, int ms, int me, int ws, int we, const char* replaceWith) {
+void showOneReplacement(string & s, int ms, int ml, int ws, int wl, const char* replaceWith) {
+
+    int me = ms + ml;
+    int we = ws + wl;
 
     assert( ms >= 0 && ms <= me && me <= size(s) );
     assert( ws >= 0 && ws <= we && we <= size(s) );
 
-    string mod = s(ms, me)`shareEdits;
-    string wit = s(ws, we)`shareEdits;
+    string mod = s(ms, ml)`shareEdits;
+    string wit = s(ws, wl)`shareEdits;
 
     string modOld = mod;
@@ -118 +123 @@
 void runReplaceCases() {
     char * alphabetTemplate = "abcdefghijklmnopqrstuvwxyz";
-    struct { int ms; int me; int ws; int we; char *replaceWith; char *label; } cases[] = {
-        { 12, 14, 10, 20, "xxxxx", "warmup" },
-        { 10, 10, 10, 10, "=====", "1"      },
-        { 10, 10, 10, 10, "=="   , ""       },
-        { 10, 10, 10, 10, "="    , ""       },
-        { 10, 10, 10, 10, ""     , ""       },
-        { 10, 12, 12, 12, "=====", "2"      },
-        { 10, 12, 12, 12, "=="   , ""       },
-        { 10, 12, 12, 12, "="    , ""       },
-        { 10, 12, 12, 12, ""     , ""       },
-        { 12, 12, 10, 12, "=====", "3"      },
-        { 12, 12, 10, 12, "=="   , ""       },
-        { 12, 12, 10, 12, "="    , ""       },
-        { 12, 12, 10, 12, ""     , ""       },
-        { 10, 10, 12, 12, "=====", "4"      },
-        { 10, 10, 12, 12, "=="   , ""       },
-        { 10, 10, 12, 12, "="    , ""       },
-        { 10, 10, 12, 12, ""     , ""       },
-        { 12, 12, 10, 10, "=====", "5"      },
-        { 12, 12, 10, 10, "=="   , ""       },
-        { 12, 12, 10, 10, "="    , ""       },
-        { 12, 12, 10, 10, ""     , ""       },
-        { 10, 12, 10, 12, "=====", "6"      },
-        { 10, 12, 10, 12, "=="   , ""       },
-        { 10, 12, 10, 12, "="    , ""       },
-        { 10, 12, 10, 12, ""     , ""       },
-        { 10, 12, 10, 10, "=====", "7"      },
-        { 10, 12, 10, 10, "=="   , ""       },
-        { 10, 12, 10, 10, "="    , ""       },
-        { 10, 12, 10, 10, ""     , ""       },
-        { 10, 10, 10, 12, "=====", "8"      },
-        { 10, 10, 10, 12, "=="   , ""       },
-        { 10, 10, 10, 12, "="    , ""       },
-        { 10, 10, 10, 12, ""     , ""       },
-        { 10, 12, 14, 14, "=====", "9"      },
-        { 10, 12, 14, 14, "=="   , ""       },
-        { 10, 12, 14, 14, "="    , ""       },
-        { 10, 12, 14, 14, ""     , ""       },
-        { 10, 14, 12, 14, "=====", "10"     },
-        { 10, 14, 12, 14, "=="   , ""       },
-        { 10, 14, 12, 14, "="    , ""       },  // FORMERLY unrunnable bug: tries to print seemingly infinite string
-        { 10, 14, 12, 14, ""     , ""       },  // ditto
-        { 14, 14, 10, 12, "=====", "11"     },
-        { 14, 14, 10, 12, "=="   , ""       },
-        { 14, 14, 10, 12, "="    , ""       },
-        { 14, 14, 10, 12, ""     , ""       },
-        { 12, 14, 10, 14, "=====", "12"     }, // correctness observation:  watching klmn while mn |-> xxx gives klxxx because the mn is inside what I'm watching
-        { 12, 14, 10, 14, "=="   , ""       },
-        { 12, 14, 10, 14, "="    , ""       },
-        { 12, 14, 10, 14, ""     , ""       },
-        { 10, 12, 12, 14, "=====", "13"     },
-        { 10, 12, 12, 14, "=="   , ""       },
-        { 10, 12, 12, 14, "="    , ""       },
-        { 10, 12, 12, 14, ""     , ""       },
-        { 10, 14, 12, 12, "=====", "14"     },
-        { 10, 14, 12, 12, "=="   , ""       },
-        { 10, 14, 12, 12, "="    , ""       },
-        { 10, 14, 12, 12, ""     , ""       },
-        { 12, 14, 10, 12, "=====", "15"     },
-        { 12, 14, 10, 12, "=="   , ""       },
-        { 12, 14, 10, 12, "="    , ""       },
-        { 12, 14, 10, 12, ""     , ""       },
-        { 12, 12, 10, 14, "=====", "16"     },
-        { 12, 12, 10, 14, "=="   , ""       },
-        { 12, 12, 10, 14, "="    , ""       },
-        { 12, 12, 10, 14, ""     , ""       },
-        { 10, 14, 10, 12, "=====", "17"     },
-        { 10, 14, 10, 12, "=="   , ""       },
-        { 10, 14, 10, 12, "="    , ""       },
-        { 10, 14, 10, 12, ""     , ""       },
-        { 10, 10, 12, 14, "=====", "18"     },
-        { 10, 10, 12, 14, "=="   , ""       },
-        { 10, 10, 12, 14, "="    , ""       },
-        { 10, 10, 12, 14, ""     , ""       },
-        { 10, 12, 10, 14, "=====", "19"     },
-        { 10, 12, 10, 14, "=="   , ""       },
-        { 10, 12, 10, 14, "="    , ""       },
-        { 10, 12, 10, 14, ""     , ""       },
-        { 12, 14, 10, 10, "=====", "20"     },
-        { 12, 14, 10, 10, "=="   , ""       },
-        { 12, 14, 10, 10, "="    , ""       },
-        { 12, 14, 10, 10, ""     , ""       },
-        { 10, 12, 14, 16, "=====", "21"     },
-        { 10, 12, 14, 16, "=="   , ""       },
-        { 10, 12, 14, 16, "="    , ""       },
-        { 10, 12, 14, 16, ""     , ""       },
-        { 10, 14, 12, 16, "=====", "22"     },
-        { 10, 14, 12, 16, "=="   , ""       },
-        { 10, 14, 12, 16, "="    , ""       },
-        { 10, 14, 12, 16, ""     , ""       },
-        { 10, 16, 12, 14, "=====", "23"     },
-        { 10, 16, 12, 14, "=="   , ""       },
-        { 10, 16, 12, 14, "="    , ""       },
-        { 10, 16, 12, 14, ""     , ""       },
-        { 14, 16, 10, 12, "=====", "24"     },
-        { 14, 16, 10, 12, "=="   , ""       },
-        { 14, 16, 10, 12, "="    , ""       },
-        { 14, 16, 10, 12, ""     , ""       },
-        { 12, 16, 10, 14, "=====", "25"     },
-        { 12, 16, 10, 14, "=="   , ""       },
-        { 12, 16, 10, 14, "="    , ""       },
-        { 12, 16, 10, 14, ""     , ""       },
-        { 12, 14, 10, 16, "=====", "26"     },
-        { 12, 14, 10, 16, "=="   , ""       },
-        { 12, 14, 10, 16, "="    , ""       },
-        { 12, 14, 10, 16, ""     , ""       },
+    struct { int ms; int ml; int ws; int wl; char *replaceWith; char *label; } cases[] = {
+        { 12,  2, 10, 10, "xxxxx", "warmup" },
+        { 10,  0, 10,  0, "=====", "1"      },
+        { 10,  0, 10,  0, "=="   , ""       },
+        { 10,  0, 10,  0, "="    , ""       },
+        { 10,  0, 10,  0, ""     , ""       },
+        { 10,  2, 12,  0, "=====", "2"      },
+        { 10,  2, 12,  0, "=="   , ""       },
+        { 10,  2, 12,  0, "="    , ""       },
+        { 10,  2, 12,  0, ""     , ""       },
+        { 12,  0, 10,  2, "=====", "3"      },
+        { 12,  0, 10,  2, "=="   , ""       },
+        { 12,  0, 10,  2, "="    , ""       },
+        { 12,  0, 10,  2, ""     , ""       },
+        { 10,  0, 12,  0, "=====", "4"      },
+        { 10,  0, 12,  0, "=="   , ""       },
+        { 10,  0, 12,  0, "="    , ""       },
+        { 10,  0, 12,  0, ""     , ""       },
+        { 12,  0, 10,  0, "=====", "5"      },
+        { 12,  0, 10,  0, "=="   , ""       },
+        { 12,  0, 10,  0, "="    , ""       },
+        { 12,  0, 10,  0, ""     , ""       },
+        { 10,  2, 10,  2, "=====", "6"      },
+        { 10,  2, 10,  2, "=="   , ""       },
+        { 10,  2, 10,  2, "="    , ""       },
+        { 10,  2, 10,  2, ""     , ""       },
+        { 10,  2, 10,  0, "=====", "7"      },
+        { 10,  2, 10,  0, "=="   , ""       },
+        { 10,  2, 10,  0, "="    , ""       },
+        { 10,  2, 10,  0, ""     , ""       },
+        { 10,  0, 10,  2, "=====", "8"      },
+        { 10,  0, 10,  2, "=="   , ""       },
+        { 10,  0, 10,  2, "="    , ""       },
+        { 10,  0, 10,  2, ""     , ""       },
+        { 10,  2, 14,  0, "=====", "9"      },
+        { 10,  2, 14,  0, "=="   , ""       },
+        { 10,  2, 14,  0, "="    , ""       },
+        { 10,  2, 14,  0, ""     , ""       },
+        { 10,  4, 12,  2, "=====", "10"     },
+        { 10,  4, 12,  2, "=="   , ""       },
+        { 10,  4, 12,  2, "="    , ""       },  // FORMERLY unrunnable bug: tries to print seemingly infinite string
+        { 10,  4, 12,  2, ""     , ""       },  // ditto
+        { 14,  0, 10,  2, "=====", "11"     },
+        { 14,  0, 10,  2, "=="   , ""       },
+        { 14,  0, 10,  2, "="    , ""       },
+        { 14,  0, 10,  2, ""     , ""       },
+        { 12,  2, 10,  4, "=====", "12"     }, // correctness observation:  watching klmn while mn |-> xxx gives klxxx because the mn is inside what I'm watching
+        { 12,  2, 10,  4, "=="   , ""       },
+        { 12,  2, 10,  4, "="    , ""       },
+        { 12,  2, 10,  4, ""     , ""       },
+        { 10,  2, 12,  2, "=====", "13"     },
+        { 10,  2, 12,  2, "=="   , ""       },
+        { 10,  2, 12,  2, "="    , ""       },
+        { 10,  2, 12,  2, ""     , ""       },
+        { 10,  4, 12,  0, "=====", "14"     },
+        { 10,  4, 12,  0, "=="   , ""       },
+        { 10,  4, 12,  0, "="    , ""       },
+        { 10,  4, 12,  0, ""     , ""       },
+        { 12,  2, 10,  2, "=====", "15"     },
+        { 12,  2, 10,  2, "=="   , ""       },
+        { 12,  2, 10,  2, "="    , ""       },
+        { 12,  2, 10,  2, ""     , ""       },
+        { 12,  0, 10,  4, "=====", "16"     },
+        { 12,  0, 10,  4, "=="   , ""       },
+        { 12,  0, 10,  4, "="    , ""       },
+        { 12,  0, 10,  4, ""     , ""       },
+        { 10,  4, 10,  2, "=====", "17"     },
+        { 10,  4, 10,  2, "=="   , ""       },
+        { 10,  4, 10,  2, "="    , ""       },
+        { 10,  4, 10,  2, ""     , ""       },
+        { 10,  0, 12,  2, "=====", "18"     },
+        { 10,  0, 12,  2, "=="   , ""       },
+        { 10,  0, 12,  2, "="    , ""       },
+        { 10,  0, 12,  2, ""     , ""       },
+        { 10,  2, 10,  4, "=====", "19"     },
+        { 10,  2, 10,  4, "=="   , ""       },
+        { 10,  2, 10,  4, "="    , ""       },
+        { 10,  2, 10,  4, ""     , ""       },
+        { 12,  2, 10,  0, "=====", "20"     },
+        { 12,  2, 10,  0, "=="   , ""       },
+        { 12,  2, 10,  0, "="    , ""       },
+        { 12,  2, 10,  0, ""     , ""       },
+        { 10,  2, 14,  2, "=====", "21"     },
+        { 10,  2, 14,  2, "=="   , ""       },
+        { 10,  2, 14,  2, "="    , ""       },
+        { 10,  2, 14,  2, ""     , ""       },
+        { 10,  4, 12,  4, "=====", "22"     },
+        { 10,  4, 12,  4, "=="   , ""       },
+        { 10,  4, 12,  4, "="    , ""       },
+        { 10,  4, 12,  4, ""     , ""       },
+        { 10,  6, 12,  2, "=====", "23"     },
+        { 10,  6, 12,  2, "=="   , ""       },
+        { 10,  6, 12,  2, "="    , ""       },
+        { 10,  6, 12,  2, ""     , ""       },
+        { 14,  2, 10,  2, "=====", "24"     },
+        { 14,  2, 10,  2, "=="   , ""       },
+        { 14,  2, 10,  2, "="    , ""       },
+        { 14,  2, 10,  2, ""     , ""       },
+        { 12,  4, 10,  4, "=====", "25"     },
+        { 12,  4, 10,  4, "=="   , ""       },
+        { 12,  4, 10,  4, "="    , ""       },
+        { 12,  4, 10,  4, ""     , ""       },
+        { 12,  2, 10,  6, "=====", "26"     },
+        { 12,  2, 10,  6, "=="   , ""       },
+        { 12,  2, 10,  6, "="    , ""       },
+        { 12,  2, 10,  6, ""     , ""       },
     };
     for ( i; sizeof(cases)/sizeof(cases[0]) ) {
         sout | "------------------------------------------------------------------------" | cases[i].label;
         string replaceIn = alphabetTemplate;
-        showOneReplacement( replaceIn, cases[i].ms, cases[i].me, cases[i].ws, cases[i].we, cases[i].replaceWith );
+        showOneReplacement( replaceIn, cases[i].ms, cases[i].ml, cases[i].ws, cases[i].wl, cases[i].replaceWith );
     }
 }
@@ -244 +249 @@
     string s = "abcdefghijklmnopqrstuvwxyz";
 
-    s(5,10) = "qqqqq";  // start=5, end=10, len=5
-
-    sout | s;
-
-
-    s(5,5) = "-----";  // start=5, end=5, len=0
+    s(5,5) = "qqqqq";  // start=5, end=10, len=5
+
+    sout | s;
+
+
+    s(5,0) = "-----";  // start=5, end=5, len=0
 
     sout | s;