From c0030c5a2056df155af07cf10c77b9c8a7725e23 Mon Sep 17 00:00:00 2001
From: B Kleinen <kleinen@infrastructure.de>
Date: Wed, 18 Apr 2012 22:57:52 +0200
Subject: [PATCH] koans ready

---
 CPPKoans.sdf                        | Bin 8998912 -> 8998912 bytes
 CPPKoans/AboutAssert.cpp            |  10 +++++-----
 CPPKoans/AboutBitwiseOperators.cpp  |  22 ++++++++++----------
 CPPKoans/AboutClasses.cpp           |  12 +++++------
 CPPKoans/AboutControlStructures.cpp |  12 +++++------
 CPPKoans/AboutDataTypes.cpp         |  17 ++++++++--------
 CPPKoans/AboutErrorHandling.cpp     |   2 +-
 CPPKoans/AboutFunctionCalls.cpp     |   8 ++++----
 CPPKoans/AboutPointers.cpp          |   2 +-
 CPPKoans/AboutStrings.cpp           |  30 ++++++++++++++--------------
 CPPKoans/AboutUserDefinedTypes.cpp  |   2 +-
 CPPKoans/Assert.h                   |   5 ++++-
 scripts/replace_expectations.rb     |   9 ++++++++-
 13 files changed, 69 insertions(+), 62 deletions(-)

diff --git a/CPPKoans.sdf b/CPPKoans.sdf
index 86e537696f91e8cf2469b09af51e4bbcd4d2df1a..02c3674172b1bcd4cad4937df4f6358873ce6d0a 100755
GIT binary patch
delta 16739
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
K?CWlR`+osdCuTVS

delta 8065
zcmeHMd010d+P~-CY&VdQ$QnRNfS{;gf@lE|l3J^%U}D|Z6Bo1?HF3cOfyC<7j!q?7
zJz_<Zj;3{;P_;*`qr{GOu~y==TCEF=V{1FL65FZWM!$0treZtabe{R+`)9uUJm;L;
zbI<bL`@Zk_{oXeY_b!2h6t-ejX#_>C-?-Q`+CevFUnrK+S6+QNMWCbp_V<HQ!+apL
zY@(<s2c5>hGO{5r@`EYLK}z;Pm+@l;8&;cEh+MGy3X|6a6zsH=ibRb7Qg+NjaK9J(
zW8K^D^&<CgU{+1vkK)|G>!uy-PV>3yfCy4ahuO#t5wyGs&5MYPrIW)gh(N6ok#RtY
zNpl{ctC5kZ_<}4l9ncnpzm-Qy0INNdSn)eCq@F#@M!!gRkvAQoqLTS4!grJ!XqVG+
zsk~mk1CWbS;?M7;e<eg8f1Ummz9)$uCSU@qT9BuZNgL3*!soO&l}^9I?$9^_wa!{o
zjip*y?O$$Ru2~+aa#rc9T9*ZvdX}1(f~Ad1z>>zr!Aei1xe`=1F0w3AF7l&5gGz%E
zyG)Ek!#dOHXv3s2MM!sGx&TQhmn)D?ZhbPjwJcZ)O7+89hq{IuhX#juhM0$dA;yy6
zVEtfZnw*$n1V+8VQtT@7_qX@g^bZs|3-yJq{apP51<r!Td`rGEUz2Bk0z9Gb+uFy~
z$Ji&B>&Z3eT6!yc`*Z9$nw$U%o+#9^f$r{1TQ^O&0O}tV{ifHzK=vcMwQZOXQgew8
zm^T3<XgY$=YZ$%U>thtsr|5Mdb>9xFJ9Yw5_jpo%scTtD2lZz?u739BElWu8vw6jj
z5rOU4QVw>o-WJ9!9X%<l<a3FEdT<j<6~fUH@gQP9T51rQx#ZdP=%WN-G-g%8`yy|h
zK*ydO_{ps-Vt#WlYXb{_sDP%Zd>U6Q0-rPDUgU;c$oclz<gn@S^<9R|zZhAUP3-JP
z#5zC{cm-=6;NvK73t6zd^DAHFvIc4=X6wLxvGPIg!;EpvIS@w{iYFxwDYt-?%4=;0
z6?}J3(j_2;L9UHJg-&h(waRJpW>4Nko^>MqB2t7%|0h8bs;CEZlrLNw7{kxYZ+|8T
z&wF_*C_=?sLB6s&@9lmKozDUBPm@CnlL3pBvu@{pJAq8*pD}z1Pag0Rn8Sh><|Oh9
zi_nb*T7#~<1QsX<n4>Z`wXYQ(Ph=m1inh}d^oMOgE1*T6EkM^c&>1MQ0aPp3R833e
z*HDnP!!N~;$H4{=MRRH)rxtnDVjcTHw6Wn8;*QHPt59!^kji-<a`YDaj^Z6j(;0w$
z$!ZhBL9rJ~+^pkHsizxpy|af|`F9bu#Mv}*ue?UC2|1f6<b-@BBh}9yCjGKY686`Q
zOGtm&6_V)jjTGTgqdU%Qmm#%|Z2$P^kXVm*Mess~x|+|pPuu=zcvEqzrO9{Fa#DG+
z1z(DkXEL0Em430})b)3W{Up7Fr3ULwIVw5NOhmheTjSB4GE(h2&%~o7{&w#<CO%bP
z3+O~reoM*}QW#Rcr~z~(X+I?G;97KjxHXkiOTFrd7PjOg$@AmL$Lxbxn|u$Dq4PF*
zB9I`pCM^+2!;OM(a_ERA<kqAmAgd-V5^dL{=|B?k<Fq3p-0#mLUI6%m`WfQ|IJ-uE
z0dR^)R@QqQ8Y(bQ#l-IE$#VAgfu56iI~0WNY2#%<5k9}2)&s9vW@9Ip%`V$P<VeG8
zlVZHMha#-0dH_0+6Ex+qJ6ZV4w?B)<FTACgFY&r%kX?NQSkogQ^(JOp(x(ZdqxgBY
z&Y?PzpJnTWYj35`6Jq?ib2AXS_bU#xAeXE>7B%g&Sh4g@`Zu&!A&2Z!D{RI!5=gZm
zR-JGHT~Q}Q7et1oFcW)o$z369OZ{aR8<wu)s3_buka2~@Uk;hojRx%-HlLl8ip#PR
zUZXjOoO48Z9SQ^M`L02smO|<#W_2kxNnGd!91)>6a72V&!4c63ug^=di@9b6*R1q5
zchX4{uO>Q%5eIti0G8^QX#lXOQqMfundL=hc}HM*gc|4|en_rlepwd%P0vhVi2b9d
za~LoFE{7Q)z;n&osRCTtk4dJHFFQ>F3<O>#F5vNGI?{ca(G%5uS?&W$w5b?m#yb;z
zDvL^~@+Y*#tK&^^j#zzcYm5u6FJ|msMKojwJonz5QjvigMLe6iPu?-QP9;(AxO|R<
zl-ex_i^JFMBUC0<wMCt!@q>F&D;PAe(prU!{qY+Gc;OFGxio4yF-rg-N-2U3NL@7L
zP^`0;zE^9uD_fu4n&rweW(9kCdKyvm!>Bu6bxe~~=C9q@O#J4Ld$H7Qy(L0-FER^}
zBAJo6nj%nBk3<nN?aC0M+h>{XE+|E?bhO&lBu6%Hh5)(q3gnwR<-{V#MW!?A`VrI1
z1qG<=WorzY`w=tK1*1{RE+!ADFEfMCzQwQ;y0MFiL=)a&viJw1k((2!Tri@&RRISA
zD&nVPd?(bF%*c?VqF8`@i=m7k-yJvavFhl}*O)|<^(_;HGOsaDqj~$SPq~`J=-4%~
z^qKwE6q=^cr`MP&K%r^Z$;OT(Mu65|V1($y7$ye2b)89+KKi8iuh*Ga;BAZ1sYWmS
zcrDL&65_%D78;~zpjI4KMHaJoI~)0T@GC56lYVFt(m81%I`^YyaF`C&T96XCKd@iW
z1oY=x-}9eUp7p<Le^>Kv;2q~X_O~@}yUrNT1W$WTn@@w&u2aTSLBGdu_Ipn1Pk7!4
z9`hVi9(7~g>rIDD2U{9#KI89$2aE@T`#t;3`(68t`+|GH-o`zaJ<2`)-S*v@-GNs%
zuljc>f9HSM>1o^U*>09>cWzT|wQX{u>Zr))I9;q)7iVMl7&A`&i75U8W*q{;`FwF+
zU%XBFX>jBhSBY!=bv>3gr+*_ts!QoA5Q)I0^aPL^Zdg=vsapbw!le0<(8?q{_j>vU
z;MFC#*;v=R4c*E7tC(#|xhTnyh8#*3I;b47&<W*`sl%P26UrfrCIEJB@ciKn9{FR+
zK89;akfxZvPMt?isPhrTQ?*ki*t#We4nPm`v@&$LK2MEBTl3zhX}Aqv+?Lm!;o4N*
zwnPK_d-TB{J|qexepDwrB~9RWW%)hXM~5LfC!^6<TV>yFUN?P4vF{E4G5ay+QT@@@
zBSGByy6bi0>#oDb!@)zIL*_%^P~$<%LFGa7Yv8rUMoXi|XZ8V~`S<+i5AIX%Ga-Lf
z!32C|n=FIz8j|W%&rC>#Jl`!p-@$@(_0;6Us_3r(N};1`{w)$L3>};3+}G(N!c<ro
zSmj*hL!M+hZ9t>b;m|u;YhAU*+F*^R#$2PW)-P|Za#b0tg3CP1%*(*C#-;ux_9dDn
zfyK_nfl6nkf02EWW>H|FbD@4=>jD=tUK4AGFFU&<!`$)2#jjhk5tJv#px4UEM<h3v
z`iBLEf}xE=EJKt-{3Z4hO-W#|a<G387=#qX6$z;3!5FzQPz;LoMV9`qLStdDpQoR>
zAL!RuU@7qAoAaG{`n=XBf_*i81ARcB##~FTGS}bR-dodKpVO*$>5clJ&VvHig<8Fb
zP+>#YV1_5doB=YFT7SAdU6US2bEfIjT2o!A9*tQ8G>vMDTB-J@*i-yyW>j=N*OKII
zN%pZHoiV6sa!%5SZBA$iA%VR;q9A654>u>Q7NX(4RXy;`iwX5C=kDxvchRv|`%bxt
ziKYe-M31(H*!B`z^cq4&yXaK8opi6>B(Qe>3Qyl2U9Vu3jk(Iw)`3{R+Jpu8Kn*j3
zAaja>owD7${2&pdlt5C_ZecqxlgNe#W?qm}eUcgk$n>72H{MW?G*{>~r1;ori`ToB
z5<AZ)d|bPnMXOW=#rSM}_w%$1vUr<SJDu67R>UXncsP!y=HK58%abL5>{xgJ$18*-
z{|it54xsT_Po(g~yM_S(ySoS>;M8ibTGOohWO<J@cgXw2-g^A~1|L=l-(Zm6G$`p2
zZ~sAntWm-jccwP8($tCqo}_R2FCgixaQo}2JQHKWOzc;gy0;}&q589PebXFb1{=*C
zP}^2P^~Ne4+Y8`8+h|iHFd>aRT7_-dunR!&uAm4hdRf<?&BbiR&NQ`j!`$N`E*tx=
zxGYa&LxlDxF3WS*j$D@KwjH>vSC{5vch0CSe4l8LoRID~7ah&Vcz`M;br*{N&BuF2
zb3s3R`{lS40D2(F&bT?ze6$6qTvCfD{<o6qiJWV+oj1QYN`Q9nj4O)n6B_Y!XaxUT
zMX0iUcU&@#TV-9qqPc6dBE0@UoSgt|S_`{^lkQzf%ziWhiHsgXoI9}JJsN%RO-3UA
zkP+63@W~>f5wMj5#mBW|SPh{?+DXFLf5KA<bfkPb<a;4rl%!oNkao*lww7lzC;qG0
zOceRx|G3mdQ@HJbRRMNt71CE8(l4zgU+}9gBr3|eAi!5w_U{3(`01Qo0Pk4c{}UnJ
zP?|HB_NuiC_P2+`cgsWuYA~@4o`o8;YWDJk^yf#DzHXaXRwG<{Tavlya4$9x<+W*T
ztbE;(<2;3U53|iyGNDbYh+n#(nR_Y1K*eW=B_cVhf<$-?$2S*8N1{4T8vz=S?3OA`
zmQ6{?5D=;f_{_3)M!Jo|L<rtesrB32lNc54@72(LA4dV=SnZQSQ`19r57c-|)fcIs
z(~42#E!D^P-lPIAkj%OxqQ4#{rjh$bG4v`jn%L6!pP9{2YN|W2DZ^A6kU;H1(h1Z(
z+VFPg78O+?p=L{(I0`Y;TuB>8*(8)*qFzls1Sl%TkQCdTP90{b5wx$6I?qt`bW=QK
zrcrT>ArnCCa!pwuA=&|Wnel@g8MJ~u`BvA==ZFGI4zn4%MKgpU;v?n5+<^|MINXE+
zCWkZ>h&!a=2t>+f$;gmU<m8Zs!f%H(6f`-cp~%}I4du`r(kMQXa!5mgwnM5U9x?CY
zYNH5`m1Vq2@9e5$nH{fRp~)+6B|)QLA%m+o8urt)g26pE8>Rrj;C0B5P18CCAFnrz
zWRT*Vpp(=gpza8$F9jrv(zC&E9GLNE=L91F>bJvC(Ah&#r$x;ZsWT$#A=Q#by(6N^
z069Cx(o_XN8+I7xdJSEhVss;KWCBV-{ia=s3+Uzy9ynd1N9YouT}=|NqFYn^wWHJS
z@gR4<1IUeW?E6<B_wgf;+s2@#dwqp?XBXi_;BD#VR-O4Ob2JZfF+T&jK?LLuFtS-=
z-7k>u7832ne-3%<?Qex`&l6)7kU%*`90e95<=vROUUz04dt^`E2_6bx;GuB3Sb6^w
zB;s>8Rb;{8r1T8sh&Epq6r<XDT7<45kp6$3)LM6<k*Om>35h^F(zhqB{*$B@dsx_5
z#Anx}h}{CFJW6JXB5X@j#xbaMD@m&UI!GG2o7mjNe;)T8`F8c>+z_0Tu)PimL;13B
z4(;{Jf=Hlr90#F39!5KePBtjQ3$F;)3BB&_CRK?yx`l_^4L^h193F1Fh2Zvq0PDRK
z<HU?<Y76RB1b>T3SZo7mOEEiZWsjXb9nv3Sj)dS=(E)A;hSEgnh2hrhaMtLjBvR^N
z0;?U<NB>A2@zBe|ZDlxh<gM!orG;!|2#=2aKOTXVSv#}Us_Mdl8~OP1_IlnZ+b@HK
zdJC(X)1MdMKYWlrfc|%a&b(STN%nh|n3s4K+bcDdmPML{b@M5^ZC=Y9leMYBUZJT7
zJnNZdo&{#<XSS9HXMh=v(*x6-)AZ9?rv@y3Xos#T#wo$c{z>*po{8p(V4{9P>p0iA
z#<7;M&M}tJo>Aseo{{E}!4aMj<`G~-tI1_Dnu5bM!vkf`GCg`no=oBrq`Z-S*Q?9c
zss0#u<>de|#?rmK(Y9Z@D(aKND(yoN&J}CB0o07G893^Q^<7~+TuH4^IMohat)V7Z
zZLDstg3H>LI8f9bk(LSCoOqsG>jGX|wvGKut*wmrm`!1iQPQ)1TwWtO2gZ|KLLL%2
zZNi=-5r2Ar6?qmQ&v+`<E1a$F;5lvC2Gzyyq3}(jhi|Go=s_`u>PteLtS6=D=CUlO
zFvUdjO{lOsD~aKMD66xcCb0yC-d~!Pi~^#_Xw(*&EX2#JvO1Bx$bQAXroHyP`aP|?
zm9OG$)mhVNuc4PhwFcJyz^nX|pQ-#bukvU94VClh1{*qdDLn~)c`3a{gh)^`s<v&h
zp)$D0xG1>LxKO#kKOfBZ+jR5Xa}-ubMcXVmQ#sRLZZ9{^2u}Be)b5(<v6wA(sDXhg
z&MEfEmPyJ<`iZR*ToWwgmE(=$f@3{n17n<{^`p(Bz$nc~@QiUp&}=jZO|Id_;lVOb
znX^=1+B(cN%s<pVRD&+bwP|AiQ;Gr5=tG*?lCJ2<8|f!F*vkub2GzAEk1V)FUOE<a
z_`Z%cM1!h2RXK}~)T_iGx@9~Sr82xiMRn#Y4PW8<@2m4^rtTGpZVc@ai+nZHhlzum
znqI8i2+_$brYoM_pxQ=rKAqR6H>o~b`}cMHKJh=>2l4x?Yu^X&`@TAz22H5-B}pv0
zcbp{RTJB6Oh%j$aqqbix?N#LHRCTKu8J~eU8^QmT^61(~*3CP}@>!TH^hJH1j8DZh
z(?E?cZOhAKyrvw5%3Jo@<OO7IrtI;#Vq#nQUrXg6#8|>>?x4}|s(cliP?axxRAF+v
zOW?KTs8yFI9Bt-9<lc%7i@C>8`>{$<u$~2S<Wm*IFtLR9C`-)OX}mqTU@D`!W@_HW
zhZuu8cbG=DB;ViAZ;N;WNjm+6{;tPv$Vxvw+4!H_gei^-X5uqN!UEv+<v3K^u6<v%
zhKR#vbr8o<K^2f}Zef`~A_{Gq7K7J*T^LEr7zLb3U@zR@_1_eJMbd1nxUJk#t|)gS
z^L0xWpRRG^u@4Gg1)QO`*O04VsczpM;Mx9Xguolm2+;YJ{dc3;19N2PC||X#>Ys@B
z?J~Xw(7r+B{-+9)Uw;w0V3tHde9E@Sy%2BTZ=6bVFqeaUIM|niPjE1ggZUgR;9x%v
z7ILsZ2a7mZ%s~SOjU0TEg9AAD6bA=#@M#VX;^1HomT+(g2ZwTS7zax^SjNHO95ivz
z%)t>He1?M~IXH@gqd7Q+gJU^3j)UVlIDvx`IXH=flQ}qrgOGz34o>CZG!9PZ;0z9y
zb8sdHXL0aZ4pwk*HV3U7oWsGn9Gu5N8wc$ioX^1p99+o3MI5Z;;9?Fg;owpZF5_So
l2bXiOnu9eQtmUACgH8^v;NWu{T*<*z9OO8-+6&jT{SU;chI#-1

diff --git a/CPPKoans/AboutAssert.cpp b/CPPKoans/AboutAssert.cpp
index 8643170..ce92499 100755
--- a/CPPKoans/AboutAssert.cpp
+++ b/CPPKoans/AboutAssert.cpp
@@ -4,16 +4,16 @@
 
 
 void aboutAssertParameterTypes(){
-	expectThat("actual and expected need to be of the same type",3,3);
-	expectThat("however, if they are not the same, expected is tried to be cast to the actual type.",3.0,3);
-	expectThat("truncating information when casting to narrower type",3.1,3);
+	expectThat("actual and expected need to be of the same type",_____,3);
+	expectThat("however, if they are not the same, expected is tried to be cast to the actual type.",______,3);
+	expectThat("truncating information when casting to narrower type",______,3);
 	expectThatNot("and not if casted to a wider type",3,3.1);
 	expectThatNot("you won't get an Error for bad types","expected",42);
 	//this causes a crash
 	//expectThat("this is the error message you get when the cast failed",42,"expected");
-	expectThat("thus, you can also compare c-strings with cpp-strings","cstring",string("cstring"));
+	expectThat("thus, you can also compare c-strings with cpp-strings",_______,string("cstring"));
 }
 
 void AboutAssert::meditate(){
 	aboutAssertParameterTypes();
-}
\ No newline at end of file
+}
diff --git a/CPPKoans/AboutBitwiseOperators.cpp b/CPPKoans/AboutBitwiseOperators.cpp
index 73ab61e..b1e6789 100755
--- a/CPPKoans/AboutBitwiseOperators.cpp
+++ b/CPPKoans/AboutBitwiseOperators.cpp
@@ -8,29 +8,29 @@ void aboutShiftOperators(){
 	// 1 looks like this: 0000000000000001
 	// now we can shift the set bit around
 	unsigned short value = unsigned_one << 5;
-	expectThat("shifting to the left is like multiplying with 2^n",32,value);
+	expectThat("shifting to the left is like multiplying with 2^n",_____,value);
 	value = value >> 1;
-	expectThat("shifting to the right divides by two",16,value);
+	expectThat("shifting to the right divides by two",_____,value);
 	value = value << 12;
-	expectThat("careful though if out of bounds",0,value);
+	expectThat("careful though if out of bounds",_____,value);
 	short signed_value = one << 15;
-	expectThat("and with the sign",-32768,signed_value);
+	expectThat("and with the sign",_____,signed_value);
 	
 	unsigned unsigned_integer = 1 << 15;
-	expectThat("1 shifted 15 to the left is...",32768,unsigned_integer);
+	expectThat("1 shifted 15 to the left is...",_____,unsigned_integer);
 	short signed_short = short(unsigned_integer);
 	expectThatRaw("and keep in mind things can happen when numbers are casted",short(-32768),signed_short);
 }
 void aboutOperators(){
-	expectThat("| bitwise or",16,0|16);
-	expectThat("& bitwise and",1,255&1);
+	expectThat("| bitwise or",_____,0|16);
+	expectThat("& bitwise and",_____,255&1);
 	
 	unsigned fifthbitset = 1<<5;
-	expectThat("| can be used to set the nth bit",32,0|fifthbitset);
-	expectThat("& can be used to determine if the 5th bit is set like so",true,((255>>5)&1 == 1));
+	expectThat("| can be used to set the nth bit",_____,0|fifthbitset);
+	expectThat("& can be used to determine if the 5th bit is set like so",________,((255>>5)&1 == 1));
 
-	expectThat("^ bitwise XOR",6,3^5);
-	expectThat("~ bitwise negation",-4,~3);
+	expectThat("^ bitwise XOR",_____,3^5);
+	expectThat("~ bitwise negation",_____,~3);
 }
 void AboutBitwiseOperators::meditate()
 {
diff --git a/CPPKoans/AboutClasses.cpp b/CPPKoans/AboutClasses.cpp
index ca8ded4..63b4b06 100755
--- a/CPPKoans/AboutClasses.cpp
+++ b/CPPKoans/AboutClasses.cpp
@@ -44,14 +44,14 @@ void aboutMemberPolymorphism() {
 	B b;
 	A c = b;
 
-	expectThat("direct method call to a", 'a', a.method0());
-	expectThat("b inherits method0 from a", 'a', b.method0());
-	expectThat("direct method call to a", 'a', a.method1());
-	expectThat("b overwrites method1", 'b', b.method1());
+	expectThat("direct method call to a", ____, a.method0());
+	expectThat("b inherits method0 from a", ____, b.method0());
+	expectThat("direct method call to a", ____, a.method1());
+	expectThat("b overwrites method1", ____, b.method1());
 	expectThat("unless declared as virtual, methods are statically bound",
 			'a', c.method1());
-	expectThat("virtual method on b declared as B", 'b', b.method2());
-	expectThat("virtual method on b declared as A", 'a', c.method2());
+	expectThat("virtual method on b declared as B", ____, b.method2());
+	expectThat("virtual method on b declared as A", ____, c.method2());
 
 }
 void AboutClasses::meditate() {
diff --git a/CPPKoans/AboutControlStructures.cpp b/CPPKoans/AboutControlStructures.cpp
index abe18c7..9b90695 100755
--- a/CPPKoans/AboutControlStructures.cpp
+++ b/CPPKoans/AboutControlStructures.cpp
@@ -19,7 +19,7 @@ void aboutIfStatement() {
 	} else {
 		result = 2;
 	}
-	expectThat("the if statement is just as in Java", 1, result);
+	expectThat("the if statement is just as in Java", _____, result);
 }
 void aboutIntegersTreatedAsBoolean() {
 	int a = 5;
@@ -28,7 +28,7 @@ void aboutIntegersTreatedAsBoolean() {
 	if (a = b) {
 		actual = true;
 	}
-	expectThat("integers are treated as boolean!", true, actual);
+	expectThat("integers are treated as boolean!", ________, actual);
 }
 
 void aboutWhileLoop() {
@@ -38,8 +38,7 @@ void aboutWhileLoop() {
 		count++;
 		++j;
 	}
-	expectThat("the while loop should have been run 100 times", 100,
-			count);
+	expectThat("the while loop should have been run 100 times", _____, count);
 }
 void aboutForLoop() {
 	int count = 0;
@@ -47,8 +46,7 @@ void aboutForLoop() {
 		count++;
 	}
 
-	expectThat("the for loop should have been run 100 times", 100,
-			count);
+	expectThat("the for loop should have been run 100 times", _____, count);
 }
 void aboutSwitchStatement() {
 	const double cm_per_inch = 2.54;
@@ -66,7 +64,7 @@ void aboutSwitchStatement() {
 		result = -1;
 		break;
 	}
-	expectThat("it should have computed inch to cm", 2.54, result);
+	expectThat("it should have computed inch to cm", ______, result);
 }
 void AboutControlStructures::meditate() {
 	aboutIfStatement();
diff --git a/CPPKoans/AboutDataTypes.cpp b/CPPKoans/AboutDataTypes.cpp
index a25a38e..3ce52d1 100755
--- a/CPPKoans/AboutDataTypes.cpp
+++ b/CPPKoans/AboutDataTypes.cpp
@@ -13,41 +13,40 @@ AboutDataTypes::AboutDataTypes() {
 void aboutDataTypeSizes(){
 
 	char decimal_point = '.';
-	expectThat("char is on 1 byte",1,sizeof(decimal_point));
+	expectThat("char is on 1 byte",_____,sizeof(decimal_point));
 
 	int number = 0;
-	expectThat("integer is usually 32 bit",4,sizeof(number));
+	expectThat("integer is usually 32 bit",_____,sizeof(number));
 
 	double flying_time = 2.9;
-	expectThat("double takes 8 byte ",8,sizeof(flying_time));
+	expectThat("double takes 8 byte ",_____,sizeof(flying_time));
 
 	bool tap = true;
 
-	expectThat("boolean takes 1 byte ",1,sizeof(tap));
+	expectThat("boolean takes 1 byte ",_____,sizeof(tap));
 
 
 }
 void aboutSafeTypeConversions() {
 	char c = 'a';
 	int i1 = c;
-	expectThat("converting char to int is save", 'a', (char)i1);
+	expectThat("converting char to int is save", ____, (char)i1);
 
 	int i2 = 'a';
 	char c2 = i2;
-	expectThat("converting int to char works if value is small enough",
-			'a', c2);
+	expectThat("converting int to char works if value is small enough", ____, c2);
 }
 void aboutUnsafeTypeConversions() {
 	int a = 128;
 	char c3 = a; // doesn't fit in char - char is signed -128..127
 	int b = c3;
-	expectThat("int is cut off when pressed into a char", -128, b);
+	expectThat("int is cut off when pressed into a char", _____, b);
 
 
 	double d = 47.11;
 	int i = d;
 	double converted = i;
-	expectThat("double is cut off when assigned to int", 47.00,converted);
+	expectThat("double is cut off when assigned to int", ______,converted);
 
 }
 
diff --git a/CPPKoans/AboutErrorHandling.cpp b/CPPKoans/AboutErrorHandling.cpp
index fb933f6..6b79017 100755
--- a/CPPKoans/AboutErrorHandling.cpp
+++ b/CPPKoans/AboutErrorHandling.cpp
@@ -35,7 +35,7 @@ void aboutThrowingSomething() {
 		result = 2;
 	}
 
-	expectThat("arbitrary classes can be thrown", 2, result);
+	expectThat("arbitrary classes can be thrown", _____, result);
 }
 
 void AboutErrorHandling::meditate() {
diff --git a/CPPKoans/AboutFunctionCalls.cpp b/CPPKoans/AboutFunctionCalls.cpp
index cbf5d1a..ee6a876 100755
--- a/CPPKoans/AboutFunctionCalls.cpp
+++ b/CPPKoans/AboutFunctionCalls.cpp
@@ -22,8 +22,8 @@ void someFunction1(int x, int y){
 void aboutPassingByValue(){
 	int a = 4711, b = 13;
 	someFunction1(a,b);
-	expectThat("if parameters are passed by value, ...",4711,a);
-	expectThat("they are not changed in the outside context",13,b);
+	expectThat("if parameters are passed by value, ...",_____,a);
+	expectThat("they are not changed in the outside context",_____,b);
 }
 // pass by reference: just add a &
 void someFunction2(int x, int &y){
@@ -33,8 +33,8 @@ void someFunction2(int x, int &y){
 void aboutPassingByReference(){
 	int a = 4711, b = 13;
 	someFunction2(a,b);
-	expectThat("if parameters are passed by reference, ...",4711,a);
-	expectThat("they *are* changed in the outside context",14,b);
+	expectThat("if parameters are passed by reference, ...",_____,a);
+	expectThat("they *are* changed in the outside context",_____,b);
 }
 
 
diff --git a/CPPKoans/AboutPointers.cpp b/CPPKoans/AboutPointers.cpp
index 1eac5eb..bdad8c7 100755
--- a/CPPKoans/AboutPointers.cpp
+++ b/CPPKoans/AboutPointers.cpp
@@ -11,7 +11,7 @@
 void aboutPointers(){
 	int i = 5;
 	int *i_pointer = &i;
-	expectThat("pointers contain memory addresses - they are a reference to the variable",5,*i_pointer);
+	expectThat("pointers contain memory addresses - they are a reference to the variable",_____,*i_pointer);
 }
 void AboutPointers::meditate(){
 	aboutPointers();
diff --git a/CPPKoans/AboutStrings.cpp b/CPPKoans/AboutStrings.cpp
index e2ca24e..7616e23 100755
--- a/CPPKoans/AboutStrings.cpp
+++ b/CPPKoans/AboutStrings.cpp
@@ -21,20 +21,20 @@ void aboutCStrings(){
 	char *x = aString;
 	// and sizeof determines the size of the pointer!
 	int pointerSize = sizeof(x);
-	expectThat("the size of a pointer",4,pointerSize);
+	expectThat("the size of a pointer",_____,pointerSize);
 
 	// arrays in c don't store their length.
 	// there is a method in cstring which determines it for strings looking for the terminating char.
 	char anotherString[] ="0123456789";
 	int stringLength = strlen(anotherString);
-	expectThat("the length of the string is determined by looking for the null char",10,stringLength);
+	expectThat("the length of the string is determined by looking for the null char",_____,stringLength);
 }
 void aboutStringLiterals(){
 	// internally, a c-string is an array of chars terminated by the null character \0
 	// string literals - like "hello" - are short form for that.
 	char hello1[] = {'h','e','l','l','o', '\0'};
 	char hello2[] = "hello";
-	expectThat("those strings are the same",true,(strcmp(hello1,hello2) == 0));
+	expectThat("those strings are the same",________,(strcmp(hello1,hello2) == 0));
 }
 void aboutCPPStrings(){
 	// C++ has a string library
@@ -42,23 +42,23 @@ void aboutCPPStrings(){
 	s = "big bang theory";
 
 	int l = s.length();
-	expectThat("length returns the length of the string",15,l);
+	expectThat("length returns the length of the string",_____,l);
 
-	expectThat("elements can be accessed via [] as in arrays",'b',s[4]);
+	expectThat("elements can be accessed via [] as in arrays",____,s[4]);
 	string s1 = "hello";
 	string s2 = "hello";
-	expectThat("opposed to java, == works on C++ strings",true, s1 == s2);
+	expectThat("opposed to java, == works on C++ strings",________, s1 == s2);
 
 	s[4] = 'B';
 
-	expectThat("C++ strings are mutable.", string("big Bang theory"),s);
+	expectThat("C++ strings are mutable.", _______,s);
 }
 void aboutStringAssignmentCreatesACopy(){
 	string s1 = "hello";
 	string s2 = s1;
 	s2[1] = 'a';
-	expectThat("s1 is not changed",string("hello"),s1);
-	expectThat("but s2 of course is changed",string("hallo"),s2);
+	expectThat("s1 is not changed",_______,s1);
+	expectThat("but s2 of course is changed",_______,s2);
 }
 
 string mutateString(string s){
@@ -68,8 +68,8 @@ string mutateString(string s){
 void aboutStringsAsParametersBeingCopied(){
 	string s1 = "hello";
 	string s2 = mutateString(s1);
-	expectThat("s1 is not changed by modification in function",string("hello"),s1);
-	expectThat("but the return value s2 contains the change",string("hallo"),s2);
+	expectThat("s1 is not changed by modification in function",_______,s1);
+	expectThat("but the return value s2 contains the change",_______,s2);
 }
 void mutateString(string *s_pointer){
 	*s_pointer = "Hullu";
@@ -79,19 +79,19 @@ void mutateString(string *s_pointer){
 void aboutPassingAsReferenceMutatesTheOriginalString(){
 	string s1 = "hello";
 	mutateString(&s1);
-	expectThat("if passed by reference, the string is modified",string("Hullu"),s1);
+	expectThat("if passed by reference, the string is modified",_______,s1);
 }
 
 void aboutTheConcatenationPitfall(){
 	string s1 = "a ";
-	expectThat("+ if overloaded to do string concatenation on C++ strings.",string("a cat"),s1+"cat");
-	expectThat("can also be used with chars.",string("a c"),s1+'c');
+	expectThat("+ if overloaded to do string concatenation on C++ strings.",_______,s1+"cat");
+	expectThat("can also be used with chars.",_______,s1+'c');
 	
 	// however: "a "+"cat"; won't compile - they are both c-strings
 	expectThatNot("this will compile, but not result in the expected",string("a c"),string("a "+'c'));
 	
 	char* s2 = "a123456789b123456789c";
-	expectThat("in fact, it's a pointer manipulation II",string("6789c"),string(s2+16));
+    expectThat("in fact, it's a pointer manipulation II",_______,string(s2+16));
 	
 }
 
diff --git a/CPPKoans/AboutUserDefinedTypes.cpp b/CPPKoans/AboutUserDefinedTypes.cpp
index 4915c0f..8c0d564 100755
--- a/CPPKoans/AboutUserDefinedTypes.cpp
+++ b/CPPKoans/AboutUserDefinedTypes.cpp
@@ -7,4 +7,4 @@
 #include "stdafx.h"
 #include "AboutUserDefinedTypes.h"
 
-void AboutUserDefinedTypes::meditate(){};
\ No newline at end of file
+void AboutUserDefinedTypes::meditate(){};
diff --git a/CPPKoans/Assert.h b/CPPKoans/Assert.h
index e85733b..164931c 100755
--- a/CPPKoans/Assert.h
+++ b/CPPKoans/Assert.h
@@ -43,7 +43,10 @@ template <class T,class U>
 void expectThat (string message, T expected, U actual) {
 	expectThatRaw(message+" (expected was casted to "+typeid(U).name()+")",U(expected),actual);
 }
-
+/*
+void expectThat(string message,int expected, string actual){
+	cout << "honeypot";
+}*/
 template <class T>
 void expectThatNot (string message, T expected, T actual) {
 	expectThatNotRaw(message,expected,actual);
diff --git a/scripts/replace_expectations.rb b/scripts/replace_expectations.rb
index c052561..1099e88 100755
--- a/scripts/replace_expectations.rb
+++ b/scripts/replace_expectations.rb
@@ -1,4 +1,11 @@
-require './replacer'
+puts File.realpath(__FILE__)
+require './scripts/replacer.rb'
+
+
+# this line has been replaced with int _ instead of string:
+#    expectThat("in fact, it's a pointer manipulation II",_______,string(s2+16));
+
+
 
 sourcedirname = "CPPKoans"