From 84013cb4a02a79c90931473b6976ba21d06e9d48 Mon Sep 17 00:00:00 2001
From: Aidan Hahn <aidan@aidanis.online>
Date: Thu, 28 Nov 2019 08:57:12 -0800
Subject: [PATCH] fleshed out GetVar, added Token stack collection, started
 printing module

---
 pkg/shsh/{.token.go.swp => .parsers.go.swp} | Bin 12288 -> 12288 bytes
 pkg/shsh/.stack.go.swp                      | Bin 0 -> 12288 bytes
 pkg/shsh/debug.go                           |  57 ++++++++++++++++++++
 pkg/shsh/stack.go                           |  22 ++++++++
 pkg/shsh/token.go                           |   2 +-
 pkg/shsh/var_table.go                       |  10 +++-
 6 files changed, 89 insertions(+), 2 deletions(-)
 rename pkg/shsh/{.token.go.swp => .parsers.go.swp} (75%)
 create mode 100644 pkg/shsh/.stack.go.swp
 create mode 100644 pkg/shsh/debug.go
 create mode 100644 pkg/shsh/stack.go

diff --git a/pkg/shsh/.token.go.swp b/pkg/shsh/.parsers.go.swp
similarity index 75%
rename from pkg/shsh/.token.go.swp
rename to pkg/shsh/.parsers.go.swp
index 2ffa4f6ad0b41d3908a222ca844f216178d1afb8..38eb4f46a8c2ea95a0a347f79ea7b2bac144dd4f 100644
GIT binary patch
literal 12288
zcmeI2PiqrF7>6gt-u#FC0<RUZt=Mf9r4)(?^-$1kY14`a36o^98L~UG?9R4Uson*}
zyWmaQFW}9yXF<_ZkA4KfLl6F@*|fFR+H2(<c-T$mH#6@%w~)6nu{?L5rp6})#(5zI
zKYn_2WpKH&JtRb8Gp7@k`KhBuA|n;Y(j1lXbI<x4237UgHDg<}f|^RwAn)XzAniuw
zi_CJB<>Qh4*M>aL2H3#y3>2<?ZR*U@jq8&We!->Ti!^j$>3C~7#Rk{_8(;%$fDNz#
zHoykhz<*)Dr4{iUHyJ2zbGdw04m`_`{9prYfDNz#Hoykh02^QfY=8~00XDz}PM`tV
z65_{cA>N%q@%aD0|NDRIoDlE9CfERP!E5jeyaX?R0U@{ww$BRj6MP3--~)IAo`8qo
z0aykzU<%v<H^Cq{1qMI`d_x^y!58ouY=RBo>+8RtK+Rk-8(;%$fDNz#Hoykh02^Qf
zY~XMM>j#Gr?ZPxEcbPU(UFUV1s!TeYjmRu2zaFKAwJ|*vV!e#VI(K_vZOu-4tY*8)
z{FyE{Z>d-(+Mxlvz9M7Y`pXG~(JN}+w`>2lGfEg0J`m2|UAR-53#;`Sr9M`7GNKvM
z*2#T=Z~^m21gf)s{_w!Pxy9Pf>|ueXHMye^;nq^MZ@D&3&{zQWDx4-s-WOy_biJF1
zR<-MpG}KqU7Y`SZHl&Qp)<_$y%-0ep8?oBWRA>E$J*8wbGDXrrBRx*^1@9ha+oWQZ
zV5eLJV|{JIy><Dp&`F9OeB3~!ve`wOJ^5C75d^f@u|?dXRYe`SqR1LWZJZ<Hm~4?z
e)3(%YpR0wl;WW99HeHepTR3>=?PO%4a`6j@<ODwe

literal 12288
zcmeI2O>7%Q6vw9(AP9udBM1gp#7<l6ejKP=<v>VPf}BKh94e$zce@_jqpWwA-PxoN
zg<g>0g5ZV_5)xN9fCNY2QmGP1s7ER;pz^JrT5*6I|2MO1d+j*%&`Z&b^vll7n|br*
zKW{dQvgZ!HxVXfRl@BwN2O0b6tsh^$Jau(%bq`~`AX2g?A~Nk(HbfjIt}AyNL$=p5
zhm~b<Ub$Y7v?>kJ3oCIq?pDI}j;W|%UHIir@L%q%-6~)exLE}f)qeWeG&_3a@FAMA
zuka*)<l(iOoo&Zi1*`&A0jq#jz$#!BunJfOtOEZ71ys0)UBEu}rhBQUPyG3>OZH5g
z_F)yU3RnfK0#*U5fK|XMU=^?mSOu&CRspNPZK#0LV(iYl8I$)Qc>MoA`}_aK1B_h<
ze}Esr74SW{1il6zfj2-0ya1jDC&5v$4?F}I`15|oeh0sSOW;%RA$S|S0#1SFKm|Mo
z9tD3-Gj<hx0p0`KpatsS8Sn&n987_0_c8V@_y&9iE`TOD4yxcO@Xx*21Na=g3*G@9
zH~|*G0dNPnF~!&~;Ae0Vd;&fO?*k9iz&v;s6v18KSLpT~xCp)iUxL@bIv`C8U;!Kf
z)8H>?eHnZJ-UMer4HUr?u*E816|f3e1*`(MOo462Q6izXZ?BStokTuGubY($Z>%h=
zRC%Kt1)Dr{qFDMJE}|%ic(=dP-KI<&w4-6i&fTLBk>Ik;RaaMH?uoX#MQ(x(5pn5r
zd?d-V9>y<@mk(;x!hmvJ#6p#38MU(_m57>-=LN24@j2dhyjZZzNKYC7!%S&E)yh6T
z)f{-hu5u2xOb|40eECxm#?}*Gl-#Zp4V>sz;-;VUu#Pm9nHjzqFUXEmBZFI_?IfP6
z4i=*6E#XO;UF1bZ?X2X2o8u}<M1EpEN}4v_L%nA6%IRQ{)t8p$S89y9hs!n>(2fsD
zFl-%mu)MZ3f1=KY%~Vevkfuh239ev`6`jfWVP!6dS6gk=7ne`6%#=ONGH^uKWoyiA
zJT#^6>*J^NS=D1l@@Mj{M?BOPR~uuiU@M-C)x^Dw`Vi+!!;y^SkQPq+8&S@<34>TF
z8TeQY)m$uk0Q!BgS!&St#skl;gG1H%H7Vz2M{=&eC!KDY-r7&GRIKI}&JveyM9$DZ
z<Q<%xE*1~+Vu5~~9rD+I39ZFAGdJ+tvXey4IWLW$F2i8k@upO6m(#-O@wf5DgfIt9
zUv-X0j^DwX%MTNkrFEK_kg6Y78foqfcRJVHU4-{R_HG~q94j};7?<Z0>9z2kIZ0;(
z!tm^BlN*lqO!gZ9Pfi^}XV*@Am)DRiCU)a@mhaa`OItCQJk4(D!)4oX#g^$tn{?2*
zqGO<IPrq116E)pKZ^6_ZQ?G`C8_!rMakW+^f6SYLwt?*lze$NM1LbHR<}EP6XfEvp
uBV8pjjk(2{<1&>@NZFFu4r3;sLaK0q$zF)B`7xA*j=S#QnCYYY<LqCHk)GH9

diff --git a/pkg/shsh/.stack.go.swp b/pkg/shsh/.stack.go.swp
new file mode 100644
index 0000000000000000000000000000000000000000..7bc9a938f07d956bed6668729b2118a74cec4000
GIT binary patch
literal 12288
zcmeI2!EVz)5QZm6AR$qTK;p_2IK(b-61Y@V`v5(FkSGOF<={G-#EN5E-gQM)wS5JS
zh&SK};t}A)6L8`k+MYNuyLLzgsHox;=^yF$+TNLeXTO`}-RW#?Jm!_4OA<GT!XMvz
zpRaB;8UfKHD@;65g`GMtCgD&eNtm9OW9JU1hV3WnwTY6f?6)`7Bya1H9<}rFu)5JE
zjK;w*`<ET&K>!3UL|}m)J?wUD$-TQveCy`(3soZ-1V8`;KmY_l00ck)1VCWE37EV=
zN3w-W^)_zTW8=56e#8I*AOHd&00JNY0w4eaAOHd&00JN|hXlet(f#X0Z$<Y1|MdI+
zWRd7t^iA|d^hxwl^g;ASbR>EudMSD#S`pn5T@zgqT^5~+=U35t(L0e{!>u!ioX|1|
zfB*=900@8p2!H?xfB*=9!2c3B_<Imb6v~uEY6th|YhGtx2Rr3ppo(o?O;p<SwZ|>)
z_UZ!7t7mhnjJo1Xq7I@k52M)ZwOZs#58Ra{>Q&P?aj)V5&$4-KojbfwgEEb{so8&K
zPpf<UG|QVF`<vNVr7}&G+pk`w?=a6*+Lw0gW*+da=lo~p%gcZImU`6Ot&P2zbDSEU
l?!dWJOnAFj^+0AXSM1tx9kMn>85wIJ+aAk_eYU6W=_grvrAGh&

literal 0
HcmV?d00001

diff --git a/pkg/shsh/debug.go b/pkg/shsh/debug.go
new file mode 100644
index 0000000..8cd5371
--- /dev/null
+++ b/pkg/shsh/debug.go
@@ -0,0 +1,57 @@
+package shsh
+
+import (
+    "collections"
+)
+
+func FmtToken(arg *Token) string {
+    suffix := ""
+    if arg.next != nil {
+        suffix = "->"
+    }
+
+    switch arg.tag {
+    case LIST:
+        return sprintf("(%s, List @ %p, %d)%s", "LIST", arg._inner,
+            arg.position, suffix)
+
+    default:
+        return sprintf("(%s, %s, %d)%s", GetTagAsStr(arg.tag), arg._inner,
+            arg.position, suffix)
+    }
+}
+
+func GetTagAsStr(tag token_t) string {
+    switch tag {
+    case LIST:
+        return "LIST"
+    case STRING:
+        return "STRING"
+    case NUMBER:
+        return "NUMBER"
+    case SYMBOL:
+        return "SYMBOL"
+    }
+}
+
+func PrintSExpression(arg *Token) {
+    var lists Stack;
+    lists.push(arg)
+
+loop:
+    // string builder?
+    i := lists.pop()
+    if i == nil {
+        goto done
+    }
+
+    for (iter := i; iter != nil; iter = i.next {
+        // add each string to string builder?
+    }
+
+    // print stringbuilder?
+    goto loop
+
+done:
+    // TODO: Perhaps print some debug analytics here
+}
diff --git a/pkg/shsh/stack.go b/pkg/shsh/stack.go
new file mode 100644
index 0000000..21d7daa
--- /dev/null
+++ b/pkg/shsh/stack.go
@@ -0,0 +1,22 @@
+package shsh
+
+type TokenStack struct {
+    buffer []*Token
+    int capacity
+}
+
+func (s *Stack) Push(v *Token) {
+    s.capacity++
+    *s.buffer = append(*s.buffer, v)
+}
+
+func (s *Stack) Pop() *Token {
+    if s.capacity <= 0 {
+        return nil
+    }
+
+    s.capacity--
+    res := *s.buffer[len(*s.buffer) - 1]
+    *s = *s.buffer[ :len(*s) - 1]
+    return ret
+}
diff --git a/pkg/shsh/token.go b/pkg/shsh/token.go
index bdb8626..40d85a0 100644
--- a/pkg/shsh/token.go
+++ b/pkg/shsh/token.go
@@ -14,7 +14,7 @@ const (
 
 type Token struct {
     next *Token
-    tag parse_tag
+    tag token_t
     int position
     _inner interface{}
 }
diff --git a/pkg/shsh/var_table.go b/pkg/shsh/var_table.go
index 147ac1f..0d7d807 100644
--- a/pkg/shsh/var_table.go
+++ b/pkg/shsh/var_table.go
@@ -13,5 +13,13 @@ var (
 // Library represents variables defined in inner scope
 // It is assumed library is ordered from innermost scope to outermost scope
 func GetVar(arg string, library []VarTable) *Token {
-    
+    for dict, scope := library {
+        val, ok := dict[arg]
+        if ok {
+            // TODO: maybe log which scope it was found in?
+            return val
+        }
+    }
+
+    return nil
 }