Internal functions/types

1 files changed, 9 insertions, 5 deletions

diff --git a/src/Fun/Parser.hs b/src/Fun/Parser.hs
index ff1e6bb..dbfb4f7 100644
--- a/src/Fun/Parser.hs
+++ b/src/Fun/Parser.hs
@@ -75,6 +75,13 @@ alphanum = digit <|> letter <?> "letter or digit"
 special :: Parser Char
 special = oneOf "+-*/<^>$@#&!?" <?> "special character"
 
+specialWord :: Parser String
+specialWord = oneOrMore (alphanum <|> special) <?> "special word"
+
+internalWord :: Parser String
+internalWord = literal '_' <+> specialWord >>> build <?> "special word"
+  where build (x, xs) = x : xs
+
 oneOf :: [Char] -> Parser Char
 oneOf s = char <=> (`elem` s) <?> "one of"
 
@@ -99,11 +106,8 @@ iterFull m = m <+> iterFull m >>> (\(x, y) -> x : y) <|> iterFull'
 iterFull' "" = Right ([], "")
 iterFull' _  = Left $ State [] $ Nothing
 
-token :: Parser a -> Parser a
-token = (<+-> space)
-
-accept :: String -> Parser String
-accept w = token ((oneOrMore notSpace) <=> (== w))
+acceptSpecial :: String -> Parser String
+acceptSpecial w = specialWord <=> (== w)
 
 -- Given a parser and a predicate return the parser only if it satisfies the predicate
 infix 7 <=>