From 9ab907d014387ed45376725834a6c042f60ea2ec Mon Sep 17 00:00:00 2001
From: Sage Vaillancourt <sagev9000@tutanota.com>
Date: Mon, 4 May 2020 02:24:36 +0100
Subject: [PATCH] Got results-as-operands working

---
 appinfo.json                 |   2 +-
 resources/images/appicon.png | Bin 7650 -> 891 bytes
 src/.pebblisp.c.swp          | Bin 16384 -> 24576 bytes
 src/.pebblisp.h.swp          | Bin 12288 -> 0 bytes
 src/calc.c                   |  30 ++++++++++++++++++++++++-----
 src/calc.h                   |   4 ++--
 src/pebblisp.c               |  36 +++++++++++++++++++++++++++++++----
 src/pebblisp.h               |   7 ++++---
 8 files changed, 64 insertions(+), 15 deletions(-)
 delete mode 100644 src/.pebblisp.h.swp

diff --git a/appinfo.json b/appinfo.json
index dcfa861..15793ef 100644
--- a/appinfo.json
+++ b/appinfo.json
@@ -3,7 +3,7 @@
     "capabilities": [
         ""
     ],
-    "companyName": "Save V.",
+    "companyName": "Sage V.",
     "enableMultiJS": false,
     "longName": "PebbLisp",
     "projectType": "native",
diff --git a/resources/images/appicon.png b/resources/images/appicon.png
index 65e044b9ae8deba597dd9d46f000282ecc319e57..58e43c6d9cd9962449c8342794b9076e696527f2 100644
GIT binary patch
delta 847
zcmV-V1F-z!JNpKZ83+ad006}4g=3R^8zq0JDAFNAbr1_aKpb4GVi78YTEVJ=dGsM9
zX-HCB90k{cgXrRG&_6(Qb#N5~K@mh8{0n?7QsTKupha3QT+T0F&iT0ay8w5t%9_<S
z0%*EzW>QIhIk&=x-w;9&J?O=#C|ky~Af(Z9eLo<;>V1NFweD-WI+VO60|B0RPBwo`
zo47<gv1uEOkBGbFlBf`05D%MlK;l=XOCEnRF1pM`7@OJ53~`K@FE+5$z;emdh^L6-
zil&o4x9+jRc$=}NR%HL2?1s_2zO+bnh;|GqsMvr80~Ye&A)!LwDr_XE>ZDl6P*;+&
zZSK?W`Uo^9xn45O%%V)5qU!+m7Jq*;whH58o>P>ZLobf=F#v>jfm+pZevTcdb^-*S
zfor`!U#1)<zeumvwfG^>N%y?GscX_6aJ2*UJsF}Yx>ArfS117QXY^b-pz983U-k0y
z|Ks!#$Zi4YTVVeH7%Y<aT8n!}{QTyz0O8*rKfz!BrgXZlf~Euj000JJOGkf10RI60
z0RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000McNliru<OKs294ErWS_c3C0338h
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Y-w$9b7k&M7zY3V0YynfK~zY`?bf|6L_rk5
z@t<A9q976<6*>xyPIv-|R>Xf(Xe1I3pwQ{`iq&`kq7cz3B#4?QkZh>L*ILbNvbmXE
zdw17XPI5B2=giE1&di)Mmo`WT@-_S=yrO^yoZ%eBw4hQ-Enow^e+en;B}UVLhH%^f
z=mxppCeMVnfTM)(J#0x2W~-dt6xPy2vzA!pTcl4u63unJk<=?&5!-(>vaN(%MXqlL
zx>^b8kF5Ho%GNdvS&G<BTY2y^A?uR|{~YXPT}@8hSp(V~%E&!NFkhwrKxhxK9g?)}
zNPg2DOjdlaSDUz2Bt;xx4#W7w9Zs-|i%5A&4f(=yD@uJv8{{97icty4Me-!uBw!p*
znQ+6#uox+PE8#uqtnoXKP?o-gZvy+cP4oOFL4#PR@PFVjl$HX%gMG6Z$X=b}rrUA3
Z`~WG7mhbytC|3Xg002ovPDHLkV1kOigERmD

delta 7619
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
Z0^FEl2;3(wc>bFYP?pz_tCg_`|6g0(eSZJ|

diff --git a/src/.pebblisp.c.swp b/src/.pebblisp.c.swp
index f15e35699f72d4a12002a7edd51c89a84ce5b2cb..7ab91f5ef611678aa0caa9b4de917a95edd9662f 100644
GIT binary patch
delta 2091
zcmZ|Pe@xV69KiAK0V)9pqyi$#z8**10TG}y;A#yFi-sV_p%o$>@a0!<2X_YqBv65K
z{t?BuE$bgivmCRmeRIoZXzK@UWIEK@Xo$5Hxdf%Hwf;zYKgV5AtY>>Y&-b3^`+c70
z`@QG$>Fd+=ozq2CrR^%%A!ntgNt8%Q>U5mkJNRMLY(zwm)Js=@=%);+cSpupgBE{C
z{k~T9wK`wB%GZYb+8Ez}e>~9FztPvm>$IH6{SiZQkbXT~&xzI81dGXIy%V95^Z^c`
z3ze|Kgmus(3^zk0>1&Lj7iB0$2GZ~VLJ*9ZyCmr<&f*xJM>p&!MG|fYOVasZ-u?s^
zN6?2-#NpN&N%|Hi;6N$1;C_T7457HOn#C}N(>RI&)S(1M1mhZ?>@qIlD;&o`^snOU
zw{ziv8@YG{iCB*X{)-u$$LAQqFb<#xPr{6OzWK*!$96mf12$lq?|lVd;1hg=cknij
z>Z!UQ{*;b@S4*PRH{$10?5?`>6q!21Y?0(;rMRk5srGnB<cDRY-QHwUhmCRSoH1^b
zc*x&b+u(A0Dr=pt=2WT<yQ_v<HfvXnAv&{|uEo{h@GzOlS=H!U!rN7AGI%F7=g0=L
zHl1)qx6$A4QtUOQN~_5%=NCP?$6+vA)RT$hhLywiT94wAo9#_a&T4U=+F~+W+#XjO
z8(-YNdD&a7e7;Iy%gWLO+OWx?i&=SJsV&!PQw>R5H~7a|>@K&mY=c@!(g9u6e@DH~
zX}>1N2K6@SIfxM9;E$F&5t8&5=5Q0A;S}D&Yp6svvS36Yej*e{@j80Yf?ddmjA$&d
z&Y$?hx8^Oqq~%36>($wea4l&|KtQj(Mv`m<aUX|9?5Lkclqps?hHltVj;B$8$FLpA
zFk>}lSnVu^(T?4C0x7r;>mYVAh3_$mH}!<#AubN06IHOmiW0;i3TrSQMtoxor|<$C
z*aH)y5Qq!pjWZZQJE|daiv^iTL;{Rh2q6?NlRPfreY}JhQ2~);(h-X5B#&tvMhDu^
zh;6tBzmY#iF#souk&bBmPR{rd-(dn5aRKi^?WNiak!Ye3iAj>jD2`x18c+{AvJr+m
z<cXhg5uf5+3}XndU=UX9gb@L_P0qLukyAuI*@x=gRC&n4y;zGm&cZJ^htn8>I3Hc;
zL>=<64Q7O4mRvH9!)QY-o&iNm&fKhv5E-D>r6?wk^I65=)@mLc2u$85iEdGpRHC)P
zQRgmis34&fl@%5)W+CFzMBb3q2}`_oBRgib+GD6!{PC3|C%B3C6xpLRxA-D_aUzju
zL}!Y;ly0i)?Jn<~<r!%ei_<Udz(1w!sh#<i#kR-ut!hbf>_3t0?Jg?Yk(X~Jy{wJj
z`oANFq{4zyn_2Fbyl+PJuc`fWc-L1q#Yd}y@nNy;&W4($47r%H<RrGPP8rS=i70I)
sg1&@^QqhR=1Cck4Yxo8uIF6Um3M<kOgh?J6_s*f^Ms|d2DVY}C-_cu=QUCw|

delta 1315
zcmZwFS4>k;9LMp~0tyw{qF`~wN&~c|T5v@Z!O`Hx0fK`FLON^=s8xnWEI~q|MAY6G
z2cQq?iwn$E1960ih;hURcYIJ(V#J^jfy5cV6@2sLe*X8|b4Ttu=U3LOC@WJ$<|Sk<
zO4ZMplpttYA?gz9vwfE$yEGc5@G_+IkJFAw;ac7BfPo89HF!QM<el0|&7p=lK7C-=
z5Jq?VU*J1DuW$1{9VUc~8k8ar8HmS7XraLul@RxF0p(bOG_1gKm|=tp-$R6Wi@P|9
z6R1EDQZWME!9qL=W&*8rPQinfu%c(E5YKQG4Y-I4sKQ>jk%bh*Ap~EU+Z~)m8H!Md
zjaUo|ViARrh{U@f7O*`?hzGcg<2Z<7<Rb%15QF|eA#TEj^{`<k1o~O_4!pusw4oKZ
zQG;VBLNX%oojvHqS0m*u-rzM(q7Db(->6djZBj|9TN-B>Dy>?6UMh+1Ni;j%o^9K6
zoSQxQlPJZx9=k>VpTUXAgLmc6hFFC>JLa)MN{qWB8I0ql8k1VCFuD{GR;zxC$6c`9
zX^i$ba_#AktwxiiG*6Y&&3hEmZJSnUG|8XhM+JJH@Hb<bfj>c21HUFdYM41*;ss8i
z7S$+0HkM%)g3+gD=~0hb>_aAONW`x&Av*CAw{RU7aXyT^oTF2TEUd#cs1Snpp+YpF
z5k9!!L@a(2;-BcjJ)Fi4q#zXi1os&lQHNb{BL{1-8ks8cGL_C~bdchDNGL`Yl97bz
zP@|nNKgKnjfe*V-2p1f%BMve6Mv$MQ6<2T+g-C-1Ixi&*y`=X8T5to0Q4JRsVm?wZ
z1>w-3j}X5=6OLdL=3+7|FvEn=h(Z^^ZpTA3qY8^06gyVHig0w2hZdYgEy}SKOEC}e
zh=BqA?EE0qT~cne?oh*isXIwM!Qd#cyPcv`=xNk{*PI6qxjRX#lsC-NE2NH`F|yBA
L9w6r}&<*(m-8JO%

diff --git a/src/.pebblisp.h.swp b/src/.pebblisp.h.swp
deleted file mode 100644
index 14ae09512d9965521e4fcf6bdc7419fc8cc22e4e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2&2Jk;7{;eah_;YY0pbK=NQCOFoNhjZh_C=T>86<4>&SK@N=VFlcie2UA7*#$
z5~7d;7cL0?hh7m#NPtj52srnGI8gooKuGDW9FRafGrMcA<0OZQOQl)qm))It=b3k&
zdB;hVw5C@}6*_-$n&3K5$S>+=8y{|;C1;){q{CV*hw+Y+uRz32S*$nJb596;FBVj<
z`@y!lECwwaj;V%$sfsQ;>|ESDK|pp%2c!e{=0G=UPtA{!x!D<U)F;NDrH?<ha&KC4
zlypEkARUknNC%_?(gEp!bU-?AUpf$VPLX|N{y>twp4?9zx+kylCLNFtNC%_?(gEp!
zbU->F9gq%42c!ei0qMYf=zw7n^2S4ie0mzm<M03J@Basn67nm!4SobafKR|jAOrz;
z1-uL>cm|vYf1e}dPw+eV4g3VY2cLr*;A5~4Jg^2zU=BP7o&@K>82D$5kUQWuxCOoj
zH^BQ~4b;G8@F2MP2qC**792c`wSc$43edq7@EVu}<KQ&-_blcBe}JFCci<av6MO(R
zz>DAsaBzl@Z^1s;0PEl>@E1J03%&$j0Pf*eKwi=T>40=VIv^d84*Z`EOfb)~+k{M5
ztZjRY)^bh1wUwvM(6LPxPSSvdT_;)!e7D-#DtcC3v>%Eh1f9%`s9{;T<PkD6c{+HR
zoh*==5IatD5SyoA6m+2{W}`}yOaVVB#qFBcvjg9AnHN!HZXiW8<uFAe(lLUNX+6Wq
znZ6fB)Z8=zs@Ptq8}-GrA`0_*7~S)2i<*9CM@*cHM`4C=Fe*(cFb~aEjC?nDMBdqT
z8&;jYeN<35h!UwE7sE4BxI4CY4NFZjj1x?juK2C3L28V9km)&T^<=L=D6UL6HZ_bJ
zV=t6=YP21(6T5`$(Rh#JF-N$Os3lV%)dGojIt-hb?s-xqTr5^eZagzZCH%&(M0>ZN
zZQBp78-Z1zdxbb+_^YbYBm&maj&FMr3rHF>qJ~{SapkGfLnVou6K15LhKd;-4prI-
zY}bzL9xEhe=NT@ZvuR;?KWbDY^&dGHE}y*RTRXU6#;goP9K&r{MxMHc8TiKwnMQ!&
zrWIs|r%R_4Lj07Bju(3lYv9;gXur$+HtpBa+T8l&daQ@>aS)1Y$8Gt}sFLM(@t@Ds
z>$)v=Ocp#JD8(Ut1y$)k_8$^|a!R}FnUhII>1Pc}pC*?`pPRo{DZbupRIfD4n!Y~h
zPknamFdDS-EllzhN?p(PJ-REN(-CQ{iN*%%m+~U+ABrSQoCn?;i#M(=YfY_ItJdOS
z;#FVGi#Jsj-OII7rPL^`YD2A+;$p2j)KV^17A_Tsnii{iJ#G+6^{bVIYI!K4-l&!I
z%bA#^6@4-DS}xTanOA+KvY^%S{qxD-3KfeToK0?)!@O(JX1vDir)|XEfvw5Oia$0n
zkQ<db?TJ<Ktw4yVB_py;QIhcow?ZR-n|Vuy?a-I#c*PDweughhUU<_R$C&h+7vE(~
zUu|mT3Z3J%^!)TtAFqH#y+L2#eKWK3Bb_J@Iwx{SCF_l%eyLcl>e^tMWo=;rRxLMQ
NB@=er<BQ2O{RdxseGUKs

diff --git a/src/calc.c b/src/calc.c
index 64f9f75..0b77c17 100644
--- a/src/calc.c
+++ b/src/calc.c
@@ -35,6 +35,17 @@ static void up_down_handler(ClickRecognizerRef recognizer, void *context){
   updateText();
 }
 
+static void back_handler(ClickRecognizerRef recognizer, void *context) {
+    if(mytext[0] == '\0') {
+        window_stack_remove(window_stack_get_top_window(), true);
+    } else {
+        int i = 0;
+        while(mytext[++i] != '\0') { ; }
+        mytext[i-1] = '\0';
+        updateText();
+    }
+}
+
 // Adds the current string to the main string
 static void enter(){
     strcat(mytext, getToken(selected_token));
@@ -45,10 +56,10 @@ static void enter(){
 //Calculate result, display it and reset
 static void calculate(){
     Object obj = parseEval(mytext, &env);
-    snprintf(mytext, MAX_LENGTH, "R:%d", obj.number);
+    snprintf(resulttext, MAX_LENGTH, "R:%d", obj.number);
     selected_token = 0;
     //strcpy(mytext, HAHA);
-    updateText();
+    text_layer_set_text(s_result_text_layer, resulttext);
 }
 
 // Button press handler
@@ -64,22 +75,31 @@ static void click_config_provider(void *context) {
     window_single_repeating_click_subscribe(BUTTON_ID_UP, 100, up_down_handler);
     window_single_repeating_click_subscribe(BUTTON_ID_DOWN, 100, up_down_handler);
     window_single_click_subscribe(BUTTON_ID_SELECT, select_handler);
+    window_single_click_subscribe(BUTTON_ID_BACK, back_handler);
 }
 
 static void init(void) {
     // Create a window and get information about the window
     s_window = window_create();
-    Layer *window_layer = window_get_root_layer(s_window);
+    // Layer *window_layer = window_get_root_layer(s_window);
     // Register click config provider
     window_set_click_config_provider(s_window, click_config_provider);
 
     // Input text layer setup
-    GRect text_bounds = GRect(6, 6, 132, 132);
+    GRect text_bounds = GRect(6, 6, 132, 127);
     s_input_text_layer = text_layer_create(text_bounds);
     text_layer_set_text(s_input_text_layer, getToken(1));
-    text_layer_set_font(s_input_text_layer, fonts_get_system_font(FONT_KEY_GOTHIC_24_BOLD));
+    text_layer_set_font(s_input_text_layer, fonts_get_system_font(FONT_KEY_GOTHIC_28_BOLD));
     layer_add_child(window_get_root_layer(s_window), text_layer_get_layer(s_input_text_layer));
 
+    // Result text layer setup
+    GRect result_bounds = GRect(6, 128, 132, 132);
+    s_result_text_layer = text_layer_create(result_bounds);
+    text_layer_set_text(s_result_text_layer, "R: ");
+    text_layer_set_font(s_result_text_layer, fonts_get_system_font(FONT_KEY_GOTHIC_28_BOLD));
+    text_layer_set_text_alignment(s_result_text_layer, GTextAlignmentRight);
+    layer_add_child(window_get_root_layer(s_window), text_layer_get_layer(s_result_text_layer));
+
     // Push the window, setting the window animation to 'true'
     window_stack_push(s_window, true);
     env = defaultEnv();
diff --git a/src/calc.h b/src/calc.h
index 6b4c1cc..7a23f11 100644
--- a/src/calc.h
+++ b/src/calc.h
@@ -8,11 +8,11 @@
 // Layers
 Window *s_window;
 TextLayer *s_input_text_layer;
-
-const char *HAHA = "STONKS";
+TextLayer *s_result_text_layer;
 
 char mytext[SMAX_LENGTH] = "";
 char temptext[SMAX_LENGTH] = "";
+char resulttext[MAX_LENGTH] = "";
 
 char *tokens[] = {
     "  ", "(", ")", 
diff --git a/src/pebblisp.c b/src/pebblisp.c
index 1bdda30..9c8517d 100644
--- a/src/pebblisp.c
+++ b/src/pebblisp.c
@@ -46,7 +46,7 @@ Object fetchFromEnvironment(const char *name, struct Environment *env)
 
 Result parse(struct Slice *slices)
 {
-    // printf("parse()\n");
+    printf("parse() START\n");
     struct Slice *token = slices;
     struct Slice *rest;
     if(token->text != NULL) {
@@ -62,11 +62,12 @@ Result parse(struct Slice *slices)
     } else { // todo error on closed paren
         return R(parseAtom(token), rest);
     }
+    printf("parse() END\n");
 }
 
 Result readSeq(struct Slice *tokens)
 {
-    // printf("readSeq()\n");
+    printf("readSeq() START\n");
     Object res;
     res.forward = NULL;
     res.type = TYPE_LIST;
@@ -80,13 +81,16 @@ Result readSeq(struct Slice *tokens)
             return R(res, rest);
         }
         Result r = parse(tokens);
-        march->forward = malloc(sizeof(Object));
+        printf("readSeq() before malloc\n");
+        march->forward = malloc(sizeof(struct Object));
+        printf("readSeq() after malloc\n");
         *march->forward = r.obj;
         // char out[MAX_TOK_LEN];
         // printf("stringObj: %s\n", stringObj(out, &r.obj));
         tokens = r.slices;
         march = march->forward;
     }
+    printf("readSeq() END\n");
 }
 
 Object parseAtom(struct Slice *s)
@@ -111,6 +115,8 @@ Object parseAtom(struct Slice *s)
 
 Object eval(Object *obj, struct Environment *env)
 {
+    printf("eval(): ");
+    printObj(obj);
     Object o = *obj;
     switch(obj->type) {
         case TYPE_NUMBER:
@@ -122,7 +128,9 @@ Object eval(Object *obj, struct Environment *env)
             // printf("TYPE_LIST\n");
             Object first_form = *obj->forward;
             Object first_eval = eval(&first_form, env);
-            return first_eval.func(*first_form.forward, *first_form.forward->forward);
+            Object arg1 = eval(first_form.forward, env);
+            Object arg2 = eval(first_form.forward->forward, env);
+            return first_eval.func(arg1, arg2);
         }
         case TYPE_SYMBOL:
         {
@@ -145,6 +153,22 @@ char* stringObj(char *dest, Object *obj)
     return dest;
 }
 
+void printObj(Object *obj)
+{
+    if(obj->type == TYPE_NUMBER) {
+        printf("TYPE_NUMBER");
+    } else if(obj->type == TYPE_LIST) {
+        printf("TYPE_NUMBER");
+    } else if(obj->type == TYPE_SYMBOL) {
+        printf("TYPE_NUMBER");
+    } else {
+        printf("TYPE_OTHER");
+    }
+    char temp[20];
+    stringObj(temp, obj);
+    printf(": %s\n", temp);
+}
+
 Result resultFromObjAndSlices(Object obj, struct Slice *slices)
 {
     Result r;
@@ -211,6 +235,9 @@ void addFunc(const char *name, Object (*func)(Object, Object),
 struct Environment defaultEnv() {
     struct Environment e;
     e.strings = malloc(sizeof(char*) * MAX_ENV_ELM);
+    for(int i = 0; i < MAX_ENV_ELM; i++) {
+        e.strings[i] = NULL;
+    }
     e.objects = malloc(sizeof(Object) * MAX_ENV_ELM);
     addFunc("+", &add, &e);
     addFunc("-", &sub, &e);
@@ -248,6 +275,7 @@ Object parseEval(const char *input, struct Environment *env)
     // printf("parseEval() parse()\n");
 #endif
     Object parsed = parse(tokens).obj;
+    free(tokens);
     return eval(&parsed, env);
 }
 
diff --git a/src/pebblisp.h b/src/pebblisp.h
index da97a6c..f1891e1 100644
--- a/src/pebblisp.h
+++ b/src/pebblisp.h
@@ -3,9 +3,9 @@
 
 // #define STANDALONE
 
-#define MAX_TOK_LEN 3
-#define MAX_TOK_CNT 7 // 128
-#define MAX_ENV_ELM 3 // 50
+#define MAX_TOK_LEN 4
+#define MAX_TOK_CNT 128 // 128
+#define MAX_ENV_ELM 15 // 50
 
 // static const char* tokenFail = "Missing ')'\n";
 
@@ -69,6 +69,7 @@ Object parseAtom(struct Slice *slice);
 void copySlice(char * dest, struct Slice *src);
 Object parseEval(const char *input, struct Environment *env);
 struct Environment defaultEnv();
+void printObj(Object *obj);
 
 Result resultFromObjAndSlices(Object obj, struct Slice *slices);
 Object add(Object obj1, Object obj2);