From 136c22421e50112f5c316150765a068cba59cd20 Mon Sep 17 00:00:00 2001 From: Jason Turner Date: Fri, 17 Nov 2023 13:53:25 -0700 Subject: [PATCH] Drastically reduce use of heap memory and memory leaks --- legacy/Evaluator.cpp | 20 ++++++------ legacy/Evaluator.hpp | 2 +- legacy/RationalNumber.cpp | 35 ++++++++++----------- legacy/RationalNumber.h | 13 ++++---- legacy/StringTokenizer.cpp | 63 +++++++++++-------------------------- legacy/StringTokenizer.h | 25 +++++++-------- legacy/infiz.cpp | 10 +++--- legacy/infiz.ncb | Bin 74752 -> 74752 bytes legacy/infiz.opt | Bin 61952 -> 61952 bytes legacy/infiz.plg | 8 ++--- legacy/tests.cpp | 28 +++++------------ legacy/tests/tests.plg | 38 ---------------------- 12 files changed, 78 insertions(+), 164 deletions(-) diff --git a/legacy/Evaluator.cpp b/legacy/Evaluator.cpp index 2a38818..0ee0541 100644 --- a/legacy/Evaluator.cpp +++ b/legacy/Evaluator.cpp @@ -69,7 +69,7 @@ void evaluateStacks(Stack * numbers, Stack * operators, int num) { operand2 = (RationalNumber *)numbers->pop(); operand1 = (RationalNumber *)numbers->pop(); - operand1->add(operand2); + operand1->add(*operand2); delete operand2; numbers->push(operand1); break; @@ -87,7 +87,7 @@ void evaluateStacks(Stack * numbers, Stack * operators, int num) { operand2 = (RationalNumber *)numbers->pop(); operand1 = (RationalNumber *)numbers->pop(); - operand1->multiply(operand2); + operand1->multiply(*operand2); delete operand2; numbers->push(operand1); break; @@ -97,7 +97,7 @@ void evaluateStacks(Stack * numbers, Stack * operators, int num) { operand2 = (RationalNumber *)numbers->pop(); operand1 = (RationalNumber *)numbers->pop(); - operand1->divide(operand2); + operand1->divide(*operand2); delete operand2; numbers->push(operand1); break; @@ -112,7 +112,7 @@ void evaluateStacks(Stack * numbers, Stack * operators, int num) { -RationalNumber * evaluateExpression(StringTokenizer * st) { +RationalNumber evaluateExpression(StringTokenizer & st) { Stack * operators = new Stack(); Stack * numbers = new Stack(); @@ -120,15 +120,13 @@ RationalNumber * evaluateExpression(StringTokenizer * st) { int op; - char * next; + while (st.hasMoreTokens()) { - while (st->hasMoreTokens()) { - - next = st->nextToken(); + std::string next = st.nextToken(); int * value = new int; - if (next != NULL) { + if (!next.empty()) { switch(next[0]) { case '+': *value = PLUS_SIGN; @@ -156,7 +154,7 @@ RationalNumber * evaluateExpression(StringTokenizer * st) { break; default: - *value = atoi(next); + *value = atoi(next.c_str()); op = FALSE; numbers->push(new RationalNumber(*value, 1)); break; @@ -195,6 +193,6 @@ RationalNumber * evaluateExpression(StringTokenizer * st) { if (operators->peek() != NULL) evaluateStacks(numbers, operators, 0); - return (RationalNumber *)numbers->peek(); + return *(RationalNumber *)numbers->peek(); } diff --git a/legacy/Evaluator.hpp b/legacy/Evaluator.hpp index df18c14..5766bbf 100644 --- a/legacy/Evaluator.hpp +++ b/legacy/Evaluator.hpp @@ -6,7 +6,7 @@ #include "StringTokenizer.h" int precedence(int op); -RationalNumber * evaluateExpression(StringTokenizer * st); +RationalNumber evaluateExpression(StringTokenizer &st); void evaluateStacks(Stack * numbers, Stack * operators, int num); #endif \ No newline at end of file diff --git a/legacy/RationalNumber.cpp b/legacy/RationalNumber.cpp index 9bbb605..6e391c0 100644 --- a/legacy/RationalNumber.cpp +++ b/legacy/RationalNumber.cpp @@ -7,39 +7,36 @@ RationalNumber::RationalNumber(int num, int den) { denominator = den; } -RationalNumber::~RationalNumber() { +void RationalNumber::divide(const RationalNumber & rn) { + denominator *= rn.getNumerator(); + numerator *= rn.getDenominator(); } -void RationalNumber::divide(RationalNumber * rn) { - denominator *= rn->getNumerator(); - numerator *= rn->getDenominator(); +void RationalNumber::multiply(const RationalNumber & rn) { + numerator *= rn.getNumerator(); + denominator *= rn.getDenominator(); } -void RationalNumber::multiply(RationalNumber * rn) { - numerator *= rn->getNumerator(); - denominator *= rn->getDenominator(); -} - -void RationalNumber::add(RationalNumber * rn) { - int denom = denominator * rn->getDenominator(); - numerator *= rn->getDenominator(); - int numer = numerator + (rn->getNumerator() * denominator); +void RationalNumber::add(const RationalNumber &rn) { + int denom = denominator * rn.getDenominator(); + numerator *= rn.getDenominator(); + int numer = numerator + (rn.getNumerator() * denominator); numerator = numer; denominator = denom; } -void RationalNumber::subtract(RationalNumber * rn) { - int denom = denominator * rn->getDenominator(); +void RationalNumber::subtract(const RationalNumber &rn) { + int denom = denominator * rn.getDenominator(); - numerator *= rn->getDenominator(); - int numer = numerator - (rn->getNumerator() * denominator); + numerator *= rn.getDenominator(); + int numer = numerator - (rn.getNumerator() * denominator); numerator = numer; denominator = denom; } -int RationalNumber::getDenominator() { +int RationalNumber::getDenominator() const { return denominator; } @@ -47,7 +44,7 @@ void RationalNumber::negate() { numerator*=-1; } -int RationalNumber::getNumerator() { +int RationalNumber::getNumerator() const { return numerator; } diff --git a/legacy/RationalNumber.h b/legacy/RationalNumber.h index 3c7247b..24940d1 100644 --- a/legacy/RationalNumber.h +++ b/legacy/RationalNumber.h @@ -11,15 +11,14 @@ class RationalNumber { public: RationalNumber(int num, int den); - ~RationalNumber(); - void divide(RationalNumber * rn); - void multiply(RationalNumber * rn); - void add(RationalNumber * rn); - void subtract(RationalNumber * rn); + void divide(const RationalNumber & rn); + void multiply(const RationalNumber & rn); + void add(const RationalNumber & rn); + void subtract(const RationalNumber & rn); void negate(); - int getNumerator(); - int getDenominator(); + int getNumerator() const; + int getDenominator() const; float getFloat(); diff --git a/legacy/StringTokenizer.cpp b/legacy/StringTokenizer.cpp index b31f314..94accca 100644 --- a/legacy/StringTokenizer.cpp +++ b/legacy/StringTokenizer.cpp @@ -3,54 +3,38 @@ #include "StringTokenizer.h" #include -StringTokenizer::StringTokenizer(char * n_string) { - - string = new char[strlen(n_string) + 1]; - strcpy(string, n_string); - - stringLen = strlen(string); - - currentOffset = 0; - moreTokens = 1; -} - -StringTokenizer::~StringTokenizer() +StringTokenizer::StringTokenizer(const std::string &n_string) + : string(n_string), currentOffset(0), moreTokens(true) { - delete [] string; } -char * StringTokenizer::nextToken() -{ - char* toReturn; - - int cont = 1; + +std::string StringTokenizer::nextToken() +{ int endOfToken; - for (;(currentOffset= string.size()) + moreTokens = false; return toReturn; } -int StringTokenizer::hasMoreTokens() { +bool StringTokenizer::hasMoreTokens() { return moreTokens; } -int StringTokenizer::findTokenEnd(int start, char * string) { - +int StringTokenizer::findTokenEnd(int start, const std::string& string) { if ( isNumber(string[start]) ) { - for (; (currentOffset // StringTokenizer.h @@ -12,24 +13,22 @@ class StringTokenizer { public: - StringTokenizer(char * n_string); - ~StringTokenizer(); + StringTokenizer(const std::string &n_string); - int hasMoreTokens(); - - char * nextToken(); + bool hasMoreTokens(); + std::string nextToken(); private: + std::string string; int currentOffset; - int stringLen; - char * string; - int isNumber(char c); - int isOperator(char c); - int isWhiteSpace(char c); - char * getSubString(char * string, int start, int end); - int findTokenEnd(int start, char * string); - int moreTokens; + bool moreTokens; + + static bool isNumber(char c); + static bool isOperator(char c); + static bool isWhiteSpace(char c); + static std::string getSubString(const std::string &, int start, int end); + static int findTokenEnd(int start, const std::string &); }; #endif \ No newline at end of file diff --git a/legacy/infiz.cpp b/legacy/infiz.cpp index 69253f1..7b4af99 100644 --- a/legacy/infiz.cpp +++ b/legacy/infiz.cpp @@ -16,13 +16,13 @@ void main(int argc, char * args[]) { cin.getline(input,254, '\n'); while (cin) { - StringTokenizer * st = new StringTokenizer(input); - RationalNumber * answer = evaluateExpression(st); + StringTokenizer st(input); + RationalNumber answer = evaluateExpression(st); cout << "answer: "; - if (answer->getDenominator()==1) - cout <getNumerator()<getNumerator()<<'/'<getDenominator()<<" ("<getFloat()<<")"<mPUIl6QJ-x3xt3 zKeJS?-5E{fp<8n&I>SY-P^ru2(4tFkIu&l+8|9YUqKF3a-7*0RodzxeekO^i3OF6* zO~AQMqTPb-VvH8O!0o8-2fhM409*mNP-M!6ki1?WYTNJ%uG3TOd6K_!$$ zUV5C;X)ZlRU!w_+(sU}KR2oCsG?UV3ERCb_ltB|Hljdnzl?k%qqADoILug1*V0(n# z3)9hPK7;0Ca7KL$8fH;)xZX`=w1SGlbUZp+NXNpohn}HkqHy~}ibePTf^r^n6O{q` zi@|&tgae7OAM|ykdgM7x6L~9kxV67lWy+!RE+rOvaAQo2l>GA-kK0nI#A;)x}R z67U_y7!rwcV^NoePs}+b7K6*gC*};A=Qu&kncK&rU7|T>)W<=ENFj@cp7Oqdh`lMo*{5g<#$ZjMVDF(@j==^Gl&Bx3Yz{kPC8It57Pa zEkdhI^H7FcP7Z9vYB`Tm@i5EDL^G@9ET)yF79lU5X3>+T5C~(3hi=FJVmFdi-wfI^kL9wj6q5;?zhzG zO+H0TY@~TSEbDk2Ly2S__hTI~L)Ovbdrb;0PuJ4d49YgrqUvtSp=yWbSa(AXtpRSh zE!&)0R1=E3(j7bOIq-o&-v-sQHAOoZs6%P4mfLzk4mCkW`+$5jV3(aSP#5-|8oRj$ zUa%zS%Se0n%!+ze;VP^yZ`?Q#v6K?@P4RfV9+Hr3+rew6ok3sjpvm`QZrh#f_3f?*OXULVc4zuwZ1>6`hk5tyKDy5wT4mCfR34K;y;GHB zII?8P++j|bked$Zw9AX7r98@~Ygi}4`9~vy6j4FAJ_Z4%kbV)acViPLQfHWsLr|JZ zJHzr5uzz#)9Xt~}Z4x5O04$>iUdO~dxi~anY?d)L^V)?yxpL?o!|lhw>#o$LvsaZd zb~lxW=_o8z0%gPG47cyl-L^4X=67Lb2d>}d?Go+9VQ^yjuq4A`b4M^woNwm{pGV~@~o}19Bt-9JUza1U&1A2JFY_& zm*UhX8)jmEy0yJ~8|2XGLalIrzZ}}tkdsAI=#tCyWOfXHLU=%)c${{kwI3gBmJfYk z*F8e_fYX6R0cegRH{@{s6?P3C&GYKDSauC3BD#jR>JmchQnZxwgU(=8RA`+&SUO(v zzpLe4{7j1a;k$4KYESh?ptN&sce6WDzf)NpW-F6+p4ComT40Ohjp{`6`|?Ip#OP=Dt9h;a zq*dp%zSdJVsr;P!y|#VQm~&d@R)=j;G4!+=34@`z-~Fikli>8aJ)f*BV7k=p-R&u@ z+Fz(HK3Mov+<=2m3ar`~_$FR7L(P&tZ_e9M!d{Z|Ht-Z7D0AM45X{FK&dcObkGGe} zwE89W4)BRpFRA4n*>YFS&()0`W7W=%Z^-cj4)sch*G_|%9cs$9SvI#?x$PvvJBuP1 zIOIZDEUD?`19sN9X1{Vv4t2YtR>N9JeX~4Oo7nvq`RI{PWu>-u-P&evf&W`Af#&u8 z=cu;P-xBbSC~OJT&6zWd!BXN4x1DFOED%DhJb7Uzql5MSfZk5gJFRJKY#7!vHIis8 zikW}Z0gPIaXV&l>&3xlf&flU0yoTtyFAn;PCEh&xCe%bN)Yw$tyw+bggPL2IEkOQF z->#`=!rx+*&!esj7wE11&n<7Kwx&1u1_5A?#xQ7+l?E9vvo#1{i!-53wCiPC1}uST90vc>qW?cb zwh7k+57Uc<{LOBh6Kg@tK!YEFflr+#IE8SNX1p3ljMPxSJ-8@i!zm$fsb#Rt^Scr4 z_#Ao(W6IhHgk0 z3GYF{$;vgzXvG-#pxFhM*D>CopsX9158y#y73F-sE<+x{kgg(c!gPyH*h%9wrhB#| zU=FB!U`+)N2hz!cm(RH&B)G90>Vu?wtb9F&*bmItou`0*CKQqu^d;8>Ao=%T*n(CJ zpCUQHWQEheW9aE6l|K;WlbHQ11f=9}F2X!1=zA&h%ma5pdRG1!vJ~ zlIW4IneeB2%uYai6RucB^i#B5hS8$CXZ3nMaquaEp%SX+lYfp_0xsiomI-{6xdCCd z5Kw>)wxfbC(^=r3V`-CwHrvD?v)O=B2f%q5C47zL>v96P%cY<%vp695_++vWau10G z<7?k4k15ddCd!&EuS@#3p*{(8JRx%^LNv}?5;Z;!U^k~ro~!69fU z<|z*|xJ8I<3S#X;3vLl&n{t;p{*?!}7Rw0$0dH+!eJ%7qbd=DG5IbvVJ=HYQGB7my z*ET$@hf;4|vwvg}N{r(}1lEWZ1!%z$TaUT*{`GB2eX|#*f(W6#V72PKqrwc- zd&GvnXP}1JG5kRA*C1bJQ;$}s-gn%7Q8XPbZoh!~(c<>^QTP8Hx0MHq+i)6uC$qu> zM)3_{8UJM%fA~@SZD=536j#1X6u$&15u-R1^KXle`Le@sA2D5z{SOq>`Rc;=*-?VJ zK7f12^e1#a{pVgmy+h3Ke-+d>3i(>l_hD#If9V($FC9&I7~q$V!uCF0wbqx8Nr;{O zuHQ=fO9$Rl_@$#2d`zb+eG)%W^rDNF{}Kb?@)C5!FCEnaUqn65IJ6sdGX5Vfr$zcp zM=9PNX3=b#gFi8R_>*cPO~}Qyq6q)s~+Rz$5KrfkyExR914P;elSAc3@pga!#Dg97p)2Oo+y z1sl6kks^^pyAx3#dWb3xNFdej1epVe_JpB1gdQp)3M^_6X(_=64i>e5H@jODDi9Jm z2vhhcVN*CmI{>yHW;B8UD-|r!I zdti$*s)x928@&}Rs&_vL*R(goM6OxW)YMeeXBr&pAhJLM<5@6?#Y%xLE6s>1U>?uw zU;}i)aje?}m!M;MP3wj>!6tMXoKa`iYp-i3F_6OmKyv}hU<&#JFb7t6O^bjf(`O~% zRIjgdU>wf}F|IfV&A}{m4{fI%;`;o-&>^||`3@%cXD%}*V@P9pojKFG&_Df14!pRm zow7=hQeSB@XDKFP)-FuF!a`9Qp1#GLqj4F}-t;-sV1m1b?9Q#R^Cb>pw?x*yE1F19 zf_PfSXEF0;QYQ0PS$GRh67{1QK6`>YnVoWH<3}bcvwG1oZO{7hWD5Z(>ut}8H0WDz zd)AL1X@!;bS@PhI0YSpl`h$ zSZ{mQyLeGWkO(-711Q~uR+h(J@cGq5D=e?hC%w-Ty4x*s$MRJx!<-zfF3rn@g&Ee5 z@Cjd&2C$@Wn)iFtzqNBmUL#E0rjzV1f2o|;nwsd!zsikE?=X?imt^Y<$G9Pk+4ib+ z9<|@+{Hlk)-->0##j!5g^ZqwcQTeb#b~L|b;^%Xn5&8kA?vs(qZ_IhAUA8YZw+fz* zOXI@27p3H%wc4Et)WLL5F83g5{od#asE~eB~K8;uJ=CW6X_+@j`;@cjL!Q;V8H8M64C|@$$=On9w%{#dB{j zz??8Kii)o{_KF?F4e`pccdOPL>^&od)~&S}p`dpcQR=F9txE;3aQ>}#)3_g00j-0o zfZRGX3ds1P@PB)^==E+r*!aJCH-(M7g2Bd$nLx*IAXPxK(29%Ds&`GWlOCnVsF(U^ zFYTig9iTzFkA~KLZ=qNQ=!oH)gTlTR-@jd zCiA=6WGaO9^;IvF2IeVkfGU*ija4rcv)5z|jF+&Ux=?j+3EBnKg<1idYMq}}y$iK$ znni}Trn&F@jpuZK<1(nadI}5Xz${)=A;j>a7Ya61oC&@tTQeqp4?GL|MA9w*Fvkqx)cO z-GSrQ!U}&)(Oio>P`)~Bt(ZzQslCUvcHI>rcZXKU%+UIdP-gg4sKef2J8V)WXjo%$h3M|OSIXsu&;*LIi8B!c}082>{4U|1^Pl!0_7z?B#R7`-ESJCHWt*U;cD#B zQ4Wlk%kh^kX?f?A&apFg_HZx$GGtrCC#S|;@=HVuC%yY_{r_WVT|n37KnjL`tG2wg zij6Kb9B2ZXvdGAWzLHyNPo;w1Vg>g}?90SodhrKfZVc-$XwuIlMxKFY_Ux5FOai*X zfh>=U6nvq^zetQAqsVB9f}S;iR{*z3XPkTwtX&Yz{g(lZn!Uw==%({c?1^2%8N)<( zv?(`a*;lIQgD~?NJKzCd6F@Uc9a#0_|BW21VqPm-Uf zJxw|zpWm?Y6S1u(=F5p;S`4SlqD?tw?pFqs?WaFZq|#ywv?R>L`LRwo;Y77pfrb*z zj}0Q3ex0Ml9Vl`8u~DQV6|0Ebbe<&~Aj54v@s=AicVa^PCbFSPu#*CG|vvS VU9_PcKV}Q=5ce>MT-uN~{sWL2Zn*#e literal 61952 zcmeHQT~iy^8D4?00o(Ws+eu22ZQM8z0|t!oM^ZOpC9rJt5s42cRjVx00t#YR-IZ*x z$E};0%;cg;KazHG*Xd2~GyMbUWv|-nUL|*Jnjg@aPU=4I?jA`iRzeuJxaK{~!>-PG z&-VTmZ%a zvYWv15^x!~0$c@N16~Kd3tR)p?hPD+z$BmmAs`G)0n@;Bfb0l2aXte?ffx`662O~4 z5=a4LH;3aqumIcw-U8kRz7M2<9{^;R!SNkH1r~uUkOMSe30MYJfIL9bH9!Xp zpa}d3FaZlF0cGGea0j4zTcspC8K^0v=Q@t2w1Jwfr&Aa)A_k3_X6cJRUHk0gXa5?Y zb_u%$L^q{Xw7&>0vgp4IE=xEs*<1*_Mn_p{3s8I-r*v#&SDW8PA84>5O(MDhwk$*= z9=Ds0B7Qq6(f6a(_=hNn8$XPzo=0Dag-1y}h)>^BicP5%AE(I3jUT}EqxN@{G^=F2 zu3SyeS(<63Z>W}`r$a`zyr$_TD?ObrT`w=D^ZHW$Zn~f?tJ#gTUB&r5oU@7na$_4z zY|D*ZML6i8PwU!kwNO?|h8f$IrwG*zi@Is=M-hQK&xsje2ABb6fEi#0m;q*h8DIvO z0cL<1*qaO-Ix6+8_V-C2eDwAHPgg!^Zwmz4*82N87Yq5U98{EWDiu%4_qxyIw57bR z$>CTiBeFBmV4{COzW-XKbTT|0iDi`FYi5`K+t6$!8)N zPo%=Lw#)Sa+2d1`ojJ2EUzLkxyX|gfT^M0XEth?oj`I0PD4fhF@tL`3tWh}I#x<#r zT3df}^xD!!{H0>SL?oufqtPJPrlzhB%8L;zyk63DD{ts^{rB2?+T$szYmKL@QCpOF zEEZN~BXO6D!Hv4$H3pu@)%-zmNjB;lP&H{3JrqeLg0sqXmxTJ*m10k1k=rn?FlZDt zJRgp^BW+W6oia~6JF8)^sxzPAW*4R+v6~G#SS{Zik*YP1T5;?XxxM;Chx9v6%m6dM z3@`)C05iZ0Fayj0Gr$Zm1Iz$3@Dww^`kyOoI?^TUfAv}}>wg}t*^%=$t8vYhxTZ>D zMW$Q#R~zl}%@KE||8-*aUv%aMO>O1G3@`)C05iZ0Fayj0Gr$Zm1Iz$3zzi@0PdNju z|FQm8nP%uSPpoc^-e!ra#=xUdRr4E4V^xzz`j}^?-saeqVozj|+c2&$XcVLn_q?=@b?CRT z`n!OY?6d}at98+5-Syx0;^!9EKcDl7Pd%picd2X}saI;Nti5iv{};)BUH@sdyM_MJ zI{xh>#1GJVcG|n4)%f3|0B-zttp9e_es?J}KYKo}-RXEe98X?5Y_H39W>{;Mlh?S! z&$@FeU(l)!UtBQERja6GHTf0W_bXTB3v$sk-qo_DerurDyIxyfLT&3%$|#$tL9VPr z*EKb#na+oUPWx=DgZ5H%r-swUE<0y9TP*s2_PDC;TwSAyDo)G*Gr$Zm1Iz$3zzi@0 z%m6dM3@`)Cz|+D2>%Xl3vi>V}H*h8a?*;w$ov)ldef#Rfw;_2UuU{CGL)v0_`M9^x z*-5ceQWB1K*R<{n-nz1IoYV@MYH9XfoDb+ON@sz}*;gH6IeJs?TUX!T*_%pDCb7)@ zprp*I=CW3bl(e;`Ua2{5J&*nvz*e|+r>9M$Ty!luI(tJm7Cd@l6FbM+`AuOsF$2s1 zGr$Zm1Iz$3zzi@0%m6dM3@`)#O9oi~WBrfyzrCyfop5H;33bkv{krVDdbQ8b@}#%+ z7TVswD%zf(ujY~-y_@Rq9bMx?W9KfsdineqSy%lv5c~X_N4HnM22j51sK+Z_2JosY zA$o?iqNe9GJ-gxBw&ygw0;g9}swIk{msISQYkH)@mJL}eq)Wkx8DIvO0cL<1U(&39HMI7tovX9`PWV`!^yam$|9R`#s$+Bg zuQk2T>(*@!-7ftaPx-Du_qb>K^&~Z`X8m%Ld4ap7G#;+JE_-;T2>tR%t$s<1u3cu1 zrAlUAU!FBqH9db_dEHS9PkOWWLka@+ea&ep^aA?70Xnq0<@CYjr&;rJu;|A!Ri87EW-J6vWFe+|*~ zN8JCh8?IzDuF|=$9mk_1^)h!=A&5tbp)CKAWzS_ES^+rC`5#mj1Icw^%Pu zZKm|_p>yQl%m6dM3@`)C05iZ0Fayj0Gr$Zm1Iz$3&^iOG|FZte`tRP;f1&%~4dA4w z*&8G(1#7C1OBIa8x(SJNCkZ^LXoPfbPqJ+N4#Sqr05iZ0Fayj0Gr$Zm1Iz$3zzi@0 z%m6d6+YGS&$NC@Ze|t~=>xTN*;ko&U*?%JQ{JlZtYI?<3)6xZPskD){=Lx3k*8}5C z%Y*mj;qehskB&R@HFkx3i1)zk&{xxTo%Qdd-BWspH1%xsitVCNbFSGg<}A&$(l=Dg z(9bUC3eYjW5$4O5hyMoCx9kfYj~VQz@r=aG9NQlP#SpT z<+Pj#^C2uwO%)8agcld-hPj5;#EY7#>J^iZVAAWFXh>oFvfpOO!rt*}EKozSWOKYDWjT*T! zM%5-4KSALMys0Xy<;tc{c_+0?T*&JfDFsb@iL%z(7pJ57tZ7)rQb|_Mo!dNU$#x&G ze?cu}S4PFjm^is0PR1qa5BTE!v2sJBnw*#cW`G%B2ABb6fEi#0n1Nkkfb~Dt|5*Rq zd-~spN2K@u*54<6@X^=%KVA8xePck*7F0+=nM_QX%w!_5*>G|ysDv|T&aBH<_L&UA>Zp3^o3)gnu^h2qJKcX|5~NkdAoKroJs|!!x<`GAFPinNGhrnfY7o#Z^u%-W8iuR!=hMGLFqvx9JEzPO%g$;Ts_M*%R5aD)HC0x##SAVM zWX6oG^Yu^0<1+)@XBriU7UIcJlkz!SSKngYD7g`4lXKxMOs0Y}sjX~cb2I)8rAW@L zI4Adq;;DwQDn^->tQI1%(TNtEwP+U&DlIr`$ttPf%Q7Fo8TP+29zrsScq(!$(?aM> zYBr=~wzS+2IjUQFaNzR3F6mRxe;&$t=v|(i-TQEG7|$DMPf=*`XYY*#!(*3%7nGsV zOH&tzMn^*&NJaJ!=2Hp0OmPii|DE$-o5`Y*d5mupspMqB2 z`2=;|-T>EaI~}@2=T|CS5AC4qD{x8pt=shjPe9j2mubg|+Jx&~c?MJI{7$aBaQ+aI z?N1SP{}a%8+P;Ivs5pu?_711(w#of(jsA`&fQ7^8Hb$gG#}k4A9FK2e;qiP8#2w%g zg1(QDuvrY5adl$wpPfT3792y$G5}w2@P?;KYJh(UO8K$3n> zH{)HV;bpXd{`sP&h$Bwzgg=Uv$pe)!(8?dhHdJ@kdeOf^)qjS>7vXt~0lF1(Vg{H2 zW`G&kI}EV?&-y>>|3bia6zcGNI5yirE_TX13a*{iP{FM_^U;d!!c-)7vspB|d~-y~ zZXUJb*e5dU|L%hh*8erRpY{LD9@GC1ACcNt2CC2hV(z1b{&)W25o6l|fi`2HuhaX` y$@^>~nz?nkl}9YmOmHS~J=nrSjA$mByfrd1(voQ+fk!fX=RY>?DKoHh2L1yxPYvV% diff --git a/legacy/infiz.plg b/legacy/infiz.plg index 2289607..9d7663c 100644 --- a/legacy/infiz.plg +++ b/legacy/infiz.plg @@ -6,19 +6,19 @@ --------------------Configuration: infiz - Win32 Debug--------------------

Command Lines

-Creating temporary file "C:\Users\Jason\AppData\Local\Temp\RSPB26E.tmp" with contents +Creating temporary file "C:\Users\Jason\AppData\Local\Temp\RSP51B6.tmp" with contents [ /nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"Debug/infiz.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /c "C:\Users\Jason\Documents\GitHub\infiz\legacy\infiz.cpp" ] -Creating command line "cl.exe @C:\Users\Jason\AppData\Local\Temp\RSPB26E.tmp" -Creating temporary file "C:\Users\Jason\AppData\Local\Temp\RSPB26F.tmp" with contents +Creating command line "cl.exe @C:\Users\Jason\AppData\Local\Temp\RSP51B6.tmp" +Creating temporary file "C:\Users\Jason\AppData\Local\Temp\RSP51B7.tmp" with contents [ kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/infiz.pdb" /debug /machine:I386 /out:"Debug/infiz.exe" /pdbtype:sept .\Debug\infiz.obj .\InfixEvaluator\Debug\InfixEvaluator.lib ] -Creating command line "link.exe @C:\Users\Jason\AppData\Local\Temp\RSPB26F.tmp" +Creating command line "link.exe @C:\Users\Jason\AppData\Local\Temp\RSP51B7.tmp"

Output Window

Compiling... infiz.cpp diff --git a/legacy/tests.cpp b/legacy/tests.cpp index 54af179..4749c0d 100644 --- a/legacy/tests.cpp +++ b/legacy/tests.cpp @@ -12,27 +12,13 @@ #include "Evaluator.hpp" -void run_test(const char *input, RationalNumber expected) +void run_test(const std::string &input, RationalNumber expected) { - // Possible UB, const_cast, but we need to capture the state - // then fix later! - StringTokenizer st(const_cast(input)); - - // these will have to change once I make the code correct without heap everywhere - - // why you used the heap: - // * stack was too small! (not right!) - // * that's just how we did it back then! (but that's still bad practice even then!) - // - // actual reasons: - // * I didn't understand copy constructors - // * I didn't use stdlib - // * I was learning Java also at that time - // * I don't recall professors ever discussing memory leaks or efficiency! - - RationalNumber *result = evaluateExpression(&st); - if (result->getDenominator() != expected.getDenominator() || - result->getNumerator() != expected.getNumerator()) { + StringTokenizer st(input); + RationalNumber result = evaluateExpression(st); + + if (result.getDenominator() != expected.getDenominator() || + result.getNumerator() != expected.getNumerator()) { std::cout << "FAIL: "; } else { std::cout << "PASS: "; @@ -40,7 +26,7 @@ void run_test(const char *input, RationalNumber expected) std::cout << "input: " << input << " expected: " << expected.getNumerator() << '/' << expected.getDenominator() - << " got: " << result->getNumerator() << '/' << result->getDenominator() << '\n'; + << " got: " << result.getNumerator() << '/' << result.getDenominator() << '\n'; } int main() { diff --git a/legacy/tests/tests.plg b/legacy/tests/tests.plg index ad73ca0..9cdf2d3 100644 --- a/legacy/tests/tests.plg +++ b/legacy/tests/tests.plg @@ -3,47 +3,9 @@ 
 
Build Log

 

---------------------Configuration: InfixEvaluator - Win32 Debug--------------------
-

-
Command Lines

-Creating temporary file "C:\Users\Jason\AppData\Local\Temp\RSP31DC.tmp" with contents
-[
-/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /Fp"Debug/InfixEvaluator.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
-"C:\Users\Jason\Documents\GitHub\infiz\legacy\Evaluator.cpp"
-"C:\Users\Jason\Documents\GitHub\infiz\legacy\RationalNumber.cpp"
-"C:\Users\Jason\Documents\GitHub\infiz\legacy\Stack.cpp"
-"C:\Users\Jason\Documents\GitHub\infiz\legacy\StringTokenizer.cpp"
-]
-Creating command line "cl.exe @C:\Users\Jason\AppData\Local\Temp\RSP31DC.tmp" 
-Creating command line "link.exe -lib /nologo /out:"Debug\InfixEvaluator.lib"  .\Debug\Evaluator.obj .\Debug\RationalNumber.obj .\Debug\Stack.obj .\Debug\StringTokenizer.obj "
-
Output Window

-Compiling...
-Evaluator.cpp
-RationalNumber.cpp
-Stack.cpp
-StringTokenizer.cpp
-Creating library...
-

 --------------------Configuration: tests - Win32 Debug--------------------
 

 
Command Lines

-Creating temporary file "C:\Users\Jason\AppData\Local\Temp\RSP3306.tmp" with contents
-[
-/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"Debug/tests.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
-"C:\Users\Jason\Documents\GitHub\infiz\legacy\tests.cpp"
-]
-Creating command line "cl.exe @C:\Users\Jason\AppData\Local\Temp\RSP3306.tmp" 
-Creating temporary file "C:\Users\Jason\AppData\Local\Temp\RSP3307.tmp" with contents
-[
-kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/tests.pdb" /debug /machine:I386 /out:"Debug/tests.exe" /pdbtype:sept 
-.\Debug\tests.obj
-\Users\Jason\Documents\GitHub\infiz\legacy\InfixEvaluator\Debug\InfixEvaluator.lib
-]
-Creating command line "link.exe @C:\Users\Jason\AppData\Local\Temp\RSP3307.tmp"
-
Output Window

-Compiling...
-tests.cpp
-Linking...