Fix last part of variadic

MINOR

.gitignore

@@ -166,7 +166,7 @@ tags
 
 .idea/*
 
-/koaky
+/koaky-exe
 /glados
 
 *.log

src/TextToAST.hs

@@ -34,9 +34,16 @@ stringIsNumber [x] | Data.Char.isDigit x = True
 stringIsNumber (x:xs) | Data.Char.isDigit x = stringIsNumber xs
                       | otherwise = False
 
+nextToParse' :: String -> Int -> String
+nextToParse' [] _ = []
+nextToParse' (')':xs) 1 = dropWhile skipableChar xs
+nextToParse' (')':xs) depth = nextToParse' xs (depth - 1)
+nextToParse' ('(':xs) depth = nextToParse' xs (depth + 1)
+nextToParse' (_:xs) depth = nextToParse' xs depth
+
 nextToParse :: String -> String
 nextToParse [] = []
-nextToParse ('(':xs) = xs
+nextToParse ('(':xs) = nextToParse' xs 0
 nextToParse str = dropWhile skipableChar (dropWhile notSkipableChar (dropWhile skipableChar str))
 
 countAtoms :: String -> Int -> Int
@@ -52,7 +59,7 @@ createNodeFromFunction [] _ _ = Nothing
 createNodeFromFunction _ [] _ = Nothing
 createNodeFromFunction (_:xs) _ 0 = Just (Node xs Nothing Nothing)
 createNodeFromFunction (_:xs) str 1 = Just (Node xs (textToAST str)
-    (checkNextToParse textToAST (nextToParse str)))
+    (textToAST (nextToParse str)))
 createNodeFromFunction (_:xs) str 2 =
     Just (Node xs (textToAST str) (createVariadic (nextToParse str)))
 createNodeFromFunction _ _ _ = Nothing
@@ -74,7 +81,7 @@ treeFromAtom split _ | stringIsNumber split =
                      | stringIsBool split = createBool split
 treeFromAtom split str | isFunction split =
                           createNodeFromFunction split str (countAtoms (nextToParse str) 0)
-                       | otherwise = Just (Leaf (Symbol split))
+                       | otherwise = Just (Leaf (Symbol $ takeWhile (/= ')') split))
 
 textToAST :: String -> Maybe Tree
 textToAST [] = Nothing

test/Spec.hs

@@ -28,5 +28,5 @@ unitTestsASTEqual = testGroup "AST Equal Tests"
 unitTestsASTParse :: TestTree
 unitTestsASTParse = testGroup "AST Parse Tests"
   [ testCase "Basic AST creation 0" $
-      assertEqual (textToAST "(foo abc def hij)") (Just $ (Node "foo" (Leaf (Symbol "abc"))) (Varidadic (Leaf (Symbol "def") (Leaf (Symbol "hij")))))
+      assertEqual "(foo abc def hij)" (textToAST "(foo abc def hij)") (Just $ (Node "foo" (Just $ Leaf (Symbol "abc"))) (Just $ Variadic (Just $ Leaf (Symbol "def")) (Just $ Leaf (Symbol "hij"))))
   ]