From 33f48b2a51c7527b9feb50b8fac723f1b18be7bc Mon Sep 17 00:00:00 2001 From: horpeazy Date: Thu, 6 Oct 2022 21:44:58 -0700 Subject: [PATCH] chore: clean up --- .gitignore | 1 + bytecodes/00.m | 6 +----- bytecodes/{04.m => 000.m} | 2 -- bytecodes/{03.m => 001.m} | 3 ++- bytecodes/{01.m => 06.m} | 0 bytecodes/09.m | 2 ++ bytecodes/{19.m => 11.m} | 6 +++--- bytecodes/111.m | 3 +++ bytecodes/2.m | 3 +++ bytecodes/20.m | 6 +----- bytecodes/21.m | 3 --- bytecodes/31.m | 14 -------------- bytecodes/47.m | 16 ---------------- bytecodes/{35.m => rotr.m} | 5 ----- main.c | 4 ---- monty | Bin 22624 -> 22624 bytes more_operations.c | 4 ++-- 17 files changed, 18 insertions(+), 60 deletions(-) create mode 100644 .gitignore rename bytecodes/{04.m => 000.m} (81%) rename bytecodes/{03.m => 001.m} (67%) rename bytecodes/{01.m => 06.m} (100%) rename bytecodes/{19.m => 11.m} (50%) create mode 100644 bytecodes/111.m create mode 100644 bytecodes/2.m delete mode 100644 bytecodes/21.m delete mode 100644 bytecodes/31.m delete mode 100644 bytecodes/47.m rename bytecodes/{35.m => rotr.m} (58%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a29be26 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +monty diff --git a/bytecodes/00.m b/bytecodes/00.m index bfe8e10..8f9715e 100644 --- a/bytecodes/00.m +++ b/bytecodes/00.m @@ -1,8 +1,4 @@ push 1 -push 2 +nop push 3 -push 8 pall -push 98 -push -12 -pallat diff --git a/bytecodes/04.m b/bytecodes/000.m similarity index 81% rename from bytecodes/04.m rename to bytecodes/000.m index 06c56ed..1e3d6b4 100644 --- a/bytecodes/04.m +++ b/bytecodes/000.m @@ -7,5 +7,3 @@ push 5 push 6 pall -push 99 -pint diff --git a/bytecodes/03.m b/bytecodes/001.m similarity index 67% rename from bytecodes/03.m rename to bytecodes/001.m index e29558a..ea0f8fb 100644 --- a/bytecodes/03.m +++ b/bytecodes/001.m @@ -1,3 +1,5 @@ +push 0 Push 0 onto the stack +push 1 Push 1 onto the stack push 2 push 3 @@ -9,4 +11,3 @@ push 5 push 6 -pall diff --git a/bytecodes/01.m b/bytecodes/06.m similarity index 100% rename from bytecodes/01.m rename to bytecodes/06.m diff --git a/bytecodes/09.m b/bytecodes/09.m index 057d601..aa1c979 100644 --- a/bytecodes/09.m +++ b/bytecodes/09.m @@ -1,4 +1,6 @@ push 1 +push 2 +push 3 pall swap pall diff --git a/bytecodes/19.m b/bytecodes/11.m similarity index 50% rename from bytecodes/19.m rename to bytecodes/11.m index adfb45a..63a8882 100644 --- a/bytecodes/19.m +++ b/bytecodes/11.m @@ -1,6 +1,6 @@ push 1 +push 20 push 2 -push 10 -push 3 -sub +pall +swap pall diff --git a/bytecodes/111.m b/bytecodes/111.m new file mode 100644 index 0000000..51ad32e --- /dev/null +++ b/bytecodes/111.m @@ -0,0 +1,3 @@ +nop +push 3 +pall diff --git a/bytecodes/2.m b/bytecodes/2.m new file mode 100644 index 0000000..f68f4d1 --- /dev/null +++ b/bytecodes/2.m @@ -0,0 +1,3 @@ +push -2147483648 +push 2147483647 +pall diff --git a/bytecodes/20.m b/bytecodes/20.m index 110a97d..9daeafb 100644 --- a/bytecodes/20.m +++ b/bytecodes/20.m @@ -1,5 +1 @@ -push 0 -push 10 -push 2 -mul -pall +test diff --git a/bytecodes/21.m b/bytecodes/21.m deleted file mode 100644 index 1c1746f..0000000 --- a/bytecodes/21.m +++ /dev/null @@ -1,3 +0,0 @@ -#push 2 -push 7 -pall diff --git a/bytecodes/31.m b/bytecodes/31.m deleted file mode 100644 index 8e37373..0000000 --- a/bytecodes/31.m +++ /dev/null @@ -1,14 +0,0 @@ -push 1 -push 2 -push 3 -push 4 -push 0 -push 110 -push 0 -push 108 -push 111 -push 111 -push 104 -push 99 -push 83 -pstr diff --git a/bytecodes/47.m b/bytecodes/47.m deleted file mode 100644 index b1f1d86..0000000 --- a/bytecodes/47.m +++ /dev/null @@ -1,16 +0,0 @@ -queue -push 1 -push 2 -push 3 -pall -stack -push 4 -push 5 -push 6 -pall -add -pall -queue -push 11111 -add -pall diff --git a/bytecodes/35.m b/bytecodes/rotr.m similarity index 58% rename from bytecodes/35.m rename to bytecodes/rotr.m index cc7723a..d084d06 100644 --- a/bytecodes/35.m +++ b/bytecodes/rotr.m @@ -3,11 +3,6 @@ push 3 push 4 push 5 -push 6 -push 7 -push 8 -push 9 -push 0 pall rotr pall diff --git a/main.c b/main.c index f2d6b02..f027406 100644 --- a/main.c +++ b/main.c @@ -59,16 +59,12 @@ void run_code(char *buf) line = 1; delim = "\n\t\v\r\a ;:"; token = strtok(buf, delim); - while (token) { if (is_push) { push(&stack, line, token); - line++; is_push = 0; - token = strtok(NULL, delim); - continue; } else if (strcmp(token, "push") == 0) { diff --git a/monty b/monty index 018e7e35bbe362e4aff8ba26951d8faa29339417..17dbd6527b71f326f875f366aaadba3f1e75f308 100755 GIT binary patch delta 2183 zcmZ`)eQZ-z6u7!ZLJn|13L4y&HKY;!LigTNo0mk5rLNLKt62T5Cc8!R1X2P{jd{lGaN@7hM&>S1)a`GL*PQIh0QuAmo&j4-E;I9T*j#g zjG=WysoqHkV2$3%B^=TH`jeSjUk)LBN7nbz`FV+qdE;1D+wL1=n}d%8_@OaT?4fKF!%>^}I>iV{Ug+%$-~+=4Q5 zMe)fwghYbBVdAyviAT^=PCRc69$7q)Wy<2pM!{;H9~!SwB|jL`YF(U??8lL`(+G)> z_TKF!xXJ#Ms5@Phoe~A%v}rlF=mDm%&N3)+Y?`DlPN^%>)mt8@Ri1&y0*5bFtyVTU z-K{j`wiQQeXu&(m`V%2SKi}cjpg`{Vc_=g&z}13h>8f|l7V1K}plGa0jU1Ymw&#U^ zs|AE%kNHrsJLPs^YMR@=5!LOx5viNIEC$*Qf@OK}Ta{|y(sac)_f>_SDVB0$!&2`r z&sN!mP#;M&0PL4R9eevA8fF;G`um3CA*Jj zqa{Br*%yCFDX@Fexo=2qZb)8;v-5Wq$HLdF!NN7h??Htv|H=H6?^#%C;|)pt56E5r zX$Yu!3Y@h$7i_Ii)4q?(D3(3W4XNcm#u1B*1t@RtwN#uHL;rbzI4LGO=F8G!)}>;0 z!FGEIJr@1Y{sN^h!??rj@jD4&-(Kg77qV^dun&%~PsbCg?{Jru5#m`D5UzQG0b#_` z=n*D@e8)@+POq#leZ;pVwDF$kx}uM>pwnPKQ*O|-9KI!rc8-u`w?(lQanA3e*o2rw z+>5v(E{aDGCl88ZFXC5-F~k8xq9Nq%JE%w8bQkrA*Abf#!wJ+QCJ>JxuK5G?h(996 z5ZmveK7$mH>3?E?3_>aqYY|r?HX&Y$elpue3)|UVy_0kHaf`B^(CngyOf9kC)C`>8 z0XHjc_* zptaiOxQqKb!EwwfloDf^Nj7Jszl)`iE@_dQH^=6sRRCvF_ zD-_-=6-!8!!ov!8DSU3Btar=2g@o|8%N~#7pvCKiJzj+;6<(+CV+Hd1GKEL%G7l=; z?U4Ceg%2paN#O~F%U;mU>7(VI0gC;gi~Jgsy8l<@b+R1aejdpodttrLh~6k`99C*`8?m} z`@HX+zmN0xaeXnI@kk<*pCi5mZntPGf5y zjYHN^R;-f?QhlsbXK?u5iTyk}W}TTazGKR$uPkvy-!h$JtZm0dw)IKg>j`*kF7O?0 zzwjL|3iaqIjq)$&ffYiDc~qThl-hkTP7N{YfP)ZfV@UzK>0*NWN`HfSKBd|CaK({Srg)Pf_fG5n9XV>t|&m#a2V$ zN=Ot>pS)wrnDFqzRkGL;s43YtgXS^j_522MS0wpGL@VTuaXOoxPf6)hO{On@5X@3u zi6k*Z@wN;p$BHY(T8^Vh5eJwZ&hZjfzy)|O^D=ZV6DR*74B8h7y8l2Uo*x3Sn=V=6 zblDHUmE(vFLy{vQwPDCd^i+!7F;t|LbMLW;a?IhdI(j3;5`P^|rPF)wBfW)=r(|18 z@5_~jc<%x;x*I}wL#+91f2?#5HYrX%vcq4fag;@JWC5^{ySPF%lq;*)XwP<6ytX^)YHKK zxB0JyL0ck0--bc4pn6s}ahp;za=Bir&S+^_F;^nGi%D5GErO`$w$?HE{U`_@?SkTv zXZ|?W!Z*_B25ph^#K(t7#dq2c*-9?Rle8N0d1{3mr5?y(8iahAh9OIcE3$F|*&!|D zf?P$bArDe(k=3rpc@9f$)i`wrBubex9(8|6gGJVbMx0WrA{6t)xNCSd8*wh7t2_oYWJviiE7uTEBI2yZedNy%7#k~u;cehdfcjQOi}DA)gDys z=Tv*2P4RnFyUwoI4XPbf?MBr$I26AkY3ia!Xh5g;<+{G-&=YP^MU+MB!DcmbDJCG1 znb{s%U7mzr?(OBT;%>*VZX#oa6Q7lmiVFPrw_@ExhbodRS{LvV%Fm>lA)AH~X{Ri{ zAAcf(ywjrf3sw8}ev#Qo}-M;s#oJOvl2A4UFz3RDpedEj4NBslQaQjvO diff --git a/more_operations.c b/more_operations.c index a0b03a4..9f30d3a 100644 --- a/more_operations.c +++ b/more_operations.c @@ -50,9 +50,9 @@ void _add(stack_t **stack, unsigned int line_number) * @stack: stack * @line_number: line number */ -void nop(stack_t **stack __attribute__((unused)), unsigned int line_number __attribute__((unused))) +void nop(stack_t **stack __attribute__((unused)), unsigned int line_number) { - return; + (void)line_number; } /**