From 8faa02f7f7081d8141f682111c0196b1028eb63d Mon Sep 17 00:00:00 2001
From: Aidan Hahn <aidan@aidanis.online>
Date: Sat, 16 Nov 2019 16:16:05 -0800
Subject: [PATCH] good restructure: less code

---
 pkg/shsh/.token.go.swp | Bin 0 -> 12288 bytes
 pkg/shsh/token.go      |  45 ++++++++++++++++++++---------------------
 2 files changed, 22 insertions(+), 23 deletions(-)
 create mode 100644 pkg/shsh/.token.go.swp

diff --git a/pkg/shsh/.token.go.swp b/pkg/shsh/.token.go.swp
new file mode 100644
index 0000000000000000000000000000000000000000..95b314d736d4e613493868cb3623a5261ecca31c
GIT binary patch
literal 12288
zcmeI2&2Jnv7{(na2cQ8&IUs?+q*C`o>23;_DyT@HKowCEv{{NO+HSowo?R<5o{{ZI
zyHqJTasa`lM?l=*hy;Qo;xFg{@gZ>lRfr>SLE^^a@yyO{6+*9oE&Vbde*OCKV~>?6
z9<H2Se~F&#oFFI<5VH5~jSI_non820k&q-+MkHL>s)I_xMm&z0JSfK2U8@pyH~1A3
z#AzOO`#j0IdaTFYY<uKxOuEfwXO#X^I$!S{@DALr1G$NgpIjtQJ$YiqHaWWV1U>TL
zE4SO)$9V_51Kt7efOo(<;2rP|cn7=#{{aU~wm{y%IPNINvR+;nZn>6^{^A|*4tNK=
z1Kt7efOo(<;2rP|cn7=#-U08xzt8~|67tC1guHeS#N+?})!+ZW-%rSI;1}>c_!fKv
zJ_DbEPr!As1A5>ncpMxChrrGI2>A+p2=>4=unPn@2Tp?(&;iH6GFSwE;M~E_;A`*&
zcptn6UI!sK4Laaaa0uK9emzXc4e$|o6J#I-7r`^&G4K#L0{*<0knh0f-~(_SyaV0_
zZvhQn1P_Co@Z=}(Blr@04EDeUVEsA|&H!J$1Kt7efOo(<;2rP|{LdWNB^0IGrS@ib
zrd010H@TA3D9&jb(MU)Z)4o0BsjHAJkz}!mCN#~sVn(D=(~$FwYlC>DO%?cpkl{=a
ziE<fGzQf{Xk&w1+FD=@3Pgn6vXVr3z8?F)|ITaCQG!{rLG-a|*M^jbSRE@%EBPR?2
znc@MIBaNhbk_^+B8a9l1)dbm#Sm>-<S1(PfoaBrt%`44Jjaqc7)hVVZ^__jfx!6vR
zYi^n?VxOxbFs=cM<22wQJw+oHYbRzl02RlYZ5!H=IDA`YfU>y+kWsap?|zs^1EB|@
zP-cQ`M&<LpSb481<m%;;H-j-#btfT@SRR|zI=Ag3<grMQszDpmKJEKCJ^S?JhA|LQ
za%GjE<1M3v9Nl6}5r+WDFFU7eK>@=A7XAO7rdF+~2yQeRt8*$V^>(Dw3Kx35(O9O9
zCHv#jOe=j^m|#q81I#uCN+Y|TQoZcnt)8Na$&p=IS#IoturYIPAf%q(9pu5_sV)Yu
zJJ01J4sl%DwsPtaUYTptP&^;Q*H}d0O6`jocZ!cG=2x07qtnrHpQ@EpeoUqFLLz0v
z0)Evk6vIZeSk?pF6<yesR(^`aOfp_(LiRi;#^)wv^X2Dz&-T|hHwOJW0p?Alh81~S
zz-ABi2Lx=a+4}th&a7|si`xAH0_--1Hl4)j2rzmW)$Rg1Rk&L19NI7(j+Y~fIUU!V
z2tMy=_+}5$l5%O(#BLVMZWrZNQKsBjvk6PLu@+>W4DAHAsTDl!44Wp8d4f!ublb!U
po$i#>PFuOaox_AUW0%U6u|%-F;xIqPNHP{|<Gj9II9xtW{sKeX^kx76

literal 0
HcmV?d00001

diff --git a/pkg/shsh/token.go b/pkg/shsh/token.go
index 54ddd83..cb71c6a 100644
--- a/pkg/shsh/token.go
+++ b/pkg/shsh/token.go
@@ -2,7 +2,6 @@ package token;
 
 import (
     "strings"
-    "bytes"
 )
 
 type operation func(Token) Token
@@ -13,50 +12,50 @@ type operation func(Token) Token
  * OPERATOR: an entry in a symtable
  * OPERATION: a list starting with an operator
  */
-type parse_tag enum {
-    LIST_T      iota
-    OPERAND_T   iota
-    OPERATOR_T  iota
-    OPERATION_T iota
-}
+type parse_tag int
+const (
+    LIST_T      parse_tag = iota
+    OPERAND_T   parse_tag = iota
+    OPERATOR_T  parse_tag = iota
+    OPERATION_T parse_tag = iota
+)
 
 type Token struct {
-    Token *next
-    interface{} _inner
+    next *Token
+    tag parse_tag
+    _inner interface{}
 }
 
 
 func lex(string input) Token {
     ret  := new(Token)
     iter := &ret
+    delim := ' '
     var tok strings.Builder
     iter_alloced := false
 
     for pos, char := range input {
         switch char {
-        case '\'', '\"', '`':
-            // parse new token
-            fallthrough
-        case ' ', '\t', '\n', '\f', '\r':
-            *iter = new(Token)
-            (*iter)->_inner = tok.String()
-            iter_alloced = true
+        case '\'', '"', '`':
+            delim = char
         case '(':
-            // match paren
+            delim = ')'
+
+        case delim:
             *iter = new(Token)
-            (*iter)->_inner = lex(tok.String())
+            *iter._inner = tok.String()
             iter_alloced = true
-        case ')':
-            // SHOULDNT HAPPEN
+            delim = ' '
+
         default:
             tok.WriteRune(char)
             buf_is_dirty = true
         }
 
         if iter_alloced {
-            iter = &(*iter)->next
+            iter = &(*iter.next)
             iter_alloced = false
-            // clear buffer
+            tok.Reset()
         }
     }
 }
@@ -67,7 +66,7 @@ func parse(Token *arg) {
     // Determine if a list is an operation or a list
 }
 
-func eval(Token *tree) Token* {
+func eval(Token *tree) *Token {
     // Find operations
     // Simplify operations deepest first
     // return tree of final Tokens