From d38f53208b07f083d1f147a20d28b5759e3e1d78 Mon Sep 17 00:00:00 2001
From: Aidan Hahn <aidan@aidanis.online>
Date: Mon, 18 Nov 2019 22:44:24 -0800
Subject: [PATCH] repo oops

---
 internal/shsh/match_utils.go                |   0
 pkg/shsh/{.token.go.swp => .parsers.go.swp} | Bin 12288 -> 12288 bytes
 pkg/shsh/parsers.go                         |  37 ++++++++++++++++++++
 pkg/shsh/token.go                           |  29 ++-------------
 4 files changed, 40 insertions(+), 26 deletions(-)
 delete mode 100644 internal/shsh/match_utils.go
 rename pkg/shsh/{.token.go.swp => .parsers.go.swp} (83%)
 create mode 100644 pkg/shsh/parsers.go

diff --git a/internal/shsh/match_utils.go b/internal/shsh/match_utils.go
deleted file mode 100644
index e69de29..0000000
diff --git a/pkg/shsh/.token.go.swp b/pkg/shsh/.parsers.go.swp
similarity index 83%
rename from pkg/shsh/.token.go.swp
rename to pkg/shsh/.parsers.go.swp
index 95b314d736d4e613493868cb3623a5261ecca31c..38eb4f46a8c2ea95a0a347f79ea7b2bac144dd4f 100644
GIT binary patch
delta 533
zcmZ|MO(;ZB6bJD0Fe%M2va>qW<SR2QXd>CzD4HpZEHv)S+?n^9H}6jGgOFG&B1>hb
zv47cFTPrfFS;<~WSy=dwnIdxPSGU{$o_o6YVB=t;H#3%+U*vdnoKRt+!0p}oKp>@k
z^qlr?ca(+gNZW}Pl&`fdw6=S0el#9h@n2dws73tl@N3upTaf57)HoffcR|&<h_2xZ
zDsTZOa12Lq2o@w@1U@>6-r*T)a0BPC18cAfDVTvcOu_^NIw?kNShRo!RSfb74{#4x
zP=We@jkVtwehTjI{Vt-sXJy%OZNn<04JWP2(iX0=2Zdc|ZVz!rDU)}J_L_0iaNO^(
zp{%d;@UkjO>u<W*JSWXrqhz>v*z~3_jod$1Fsd<Cvi=P}Tl+iFY3-~U>rXnmqf;!#
zOS<yR9B)b1#inFsNzN;qg=w<#Y|g5joUP}U6LX0vc6GxlvdAdU<+8{YMM1J9O46ZE
DK5~&0

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

diff --git a/pkg/shsh/parsers.go b/pkg/shsh/parsers.go
new file mode 100644
index 0000000..7ba839f
--- /dev/null
+++ b/pkg/shsh/parsers.go
@@ -0,0 +1,37 @@
+// TODO: think about package names
+// Should we have one for all our code?
+package shsh
+
+import (
+    "strings"
+)
+
+/*
+ * LIST: a list of elements
+ * OPERAND: a string or number
+ * OPERATOR: an entry in a symtable
+ * OPERATION: a list starting with an operator
+ */
+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
+)
+
+func Parse(arg *Token) {
+
+}
+
+func string_delimiters_valid(arg string) bool {
+
+}
+
+func list_is_operation(arg *Token) bool {
+
+}
+
+func string_is_operator(arg string) bool {
+
+}
diff --git a/pkg/shsh/token.go b/pkg/shsh/token.go
index cb71c6a..da572b5 100644
--- a/pkg/shsh/token.go
+++ b/pkg/shsh/token.go
@@ -1,33 +1,16 @@
-package token;
+package shsh;
 
 import (
     "strings"
 )
 
-type operation func(Token) Token
-
-/*
- * LIST: a list of elements
- * OPERAND: a string or number
- * OPERATOR: an entry in a symtable
- * OPERATION: a list starting with an operator
- */
-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 {
     next *Token
     tag parse_tag
     _inner interface{}
 }
 
-
-func lex(string input) Token {
+func Lex(input string) Token {
     ret  := new(Token)
     iter := &ret
     delim := ' '
@@ -36,6 +19,7 @@ func lex(string input) Token {
 
     for pos, char := range input {
         switch char {
+        // TODO: User configurable delimiters
         case '\'', '"', '`':
             delim = char
         case '(':
@@ -49,7 +33,6 @@ func lex(string input) Token {
 
         default:
             tok.WriteRune(char)
-            buf_is_dirty = true
         }
 
         if iter_alloced {
@@ -60,12 +43,6 @@ func lex(string input) Token {
     }
 }
 
-func parse(Token *arg) {
-    // if operand determine if operator
-    // determine operator precense in symbol table
-    // Determine if a list is an operation or a list
-}
-
 func eval(Token *tree) *Token {
     // Find operations
     // Simplify operations deepest first