Clean up and list SKI conversion fix

src/Research.hs

@@ -15,7 +15,7 @@ data T = Leaf | Stem T | Fork T T
 -- Abstract Syntax Tree for tricu
 data TricuAST
   = SVar String
-  | SInt Int
+  | SInt Integer
   | SStr String
   | SList [TricuAST]
   | SDef String [String] TricuAST
@@ -33,7 +33,7 @@ data LToken
   = LKeywordT
   | LIdentifier String
   | LNamespace String
-  | LIntegerLiteral Int
+  | LIntegerLiteral Integer
   | LStringLiteral String
   | LAssign
   | LColon
@@ -84,9 +84,9 @@ _not = Fork (Fork _true (Fork Leaf _false)) Leaf
 
 -- Marshalling
 ofString :: String -> T
-ofString str = ofList $ map (ofNumber . fromEnum) str
+ofString str = ofList $ map (ofNumber . toInteger . fromEnum) str
 
-ofNumber :: Int -> T
+ofNumber :: Integer -> T
 ofNumber 0 = Leaf
 ofNumber n =
   Fork
@@ -96,7 +96,7 @@ ofNumber n =
 ofList :: [T] -> T
 ofList = foldr Fork Leaf
 
-toNumber :: T -> Either String Int
+toNumber :: T -> Either String Integer
 toNumber Leaf = Right 0
 toNumber (Fork Leaf rest) = case toNumber rest of
   Right n -> Right (2 * n)
@@ -108,7 +108,7 @@ toNumber _ = Left "Invalid Tree Calculus number"
 
 toString :: T -> Either String String
 toString tc = case toList tc of
-  Right list -> traverse (fmap toEnum . toNumber) list
+  Right list -> traverse (fmap (toEnum . fromInteger) . toNumber) list
   Left err -> Left "Invalid Tree Calculus string"
 
 toList :: T -> Either String [T]
@@ -119,13 +119,13 @@ toList (Fork x rest) = case toList rest of
 toList _ = Left "Invalid Tree Calculus list"
 
 -- Outputs
-formatResult :: EvaluatedForm -> T -> String
-formatResult TreeCalculus = toSimpleT . show
-formatResult FSL          = show
-formatResult AST          = show . toAST
-formatResult Ternary      = toTernaryString
-formatResult Ascii        = toAscii
-formatResult Decode       = decodeResult
+formatT :: EvaluatedForm -> T -> String
+formatT TreeCalculus = toSimpleT . show
+formatT FSL          = show
+formatT AST          = show . toAST
+formatT Ternary      = toTernaryString
+formatT Ascii        = toAscii
+formatT Decode       = decodeResult
 
 toSimpleT :: String -> String
 toSimpleT s = T.unpack
@@ -166,7 +166,7 @@ decodeResult tc =
     (_, _, Right n) -> show n
     (_, Right xs@(_:_), _) -> "[" ++ intercalate ", " (map decodeResult xs) ++ "]"
     (_, Right [], _) -> "[]"
-    _ -> formatResult TreeCalculus tc
+    _ -> formatT TreeCalculus tc
   where
     isCommonChar c =
       let n = fromEnum c