X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=src%2Flex.icl;h=ac5168f4d36ffcebd808061c60e8019996c07bb7;hb=65f6bf827fa2f4d2f79f9e3bda990b7e4c4df5f1;hp=8aae65a9f28ede4115e84dbd7b9e7dc9a44401b6;hpb=c126dc3a1f66f959407cf3cf33bcba01142591c6;p=cc1516.git

diff --git a/src/lex.icl b/src/lex.icl
index 8aae65a..ac5168f 100644
--- a/src/lex.icl
+++ b/src/lex.icl
@@ -1,10 +1,8 @@
 implementation module lex
 
 import Control.Monad, Control.Applicative
-import Data.Either, Data.Maybe, Data.Map, Data.Func
-import StdString
-import StdTuple
-from StdFunc import const, o
+import Data.Either, Data.Func, Data.Maybe, Data.Functor
+from StdFunc import o
 import StdBool
 import StdList
 import StdChar
@@ -16,78 +14,62 @@ lexer r = case runParser lexProgram r of
 	(Right p, _) = Right p
 	(Left e, _) = Left $ toString e
 
-trans1 :: Char a -> Parser Char a
-trans1 t r = item t >>| pure r
-
 lexProgram :: Parser Char [Token]
-lexProgram = lexToken >>= \t->pure [(0, 0, t)]
+lexProgram = catMaybes <$> some lexToken <* eof
+	>>= \ts->pure $ (map (\t->(0, 0, t)) ts)
 
-lexToken :: Parser Char TokenValue
+lexToken :: Parser Char (Maybe TokenValue)
 lexToken = 
-	(lexKw "var" VarToken) <|>
-	(lexKw "Void" VoidToken) <|>
-	(lexKw "return" ReturnToken) <|>
-	(lexKw "if" IfToken) <|>
-	(lexKw "else" ElseToken) <|>
-	(lexKw "while" WhileToken) <|>
-	(lexKw "True" TrueToken) <|>
-	(lexKw "False" FalseToken) <|>
-	(lexKw "Int" IntTypeToken) <|>
-	(lexKw "Bool" BoolTypeToken) <|>
-	(lexKw "Char" CharTypeToken) <|>
-	//Escape chars
-	(liftM CharToken $ item '\'' *> item '\\' *> lexEscape <* item '\'') <|>
-	//Normal chars
-	(liftM CharToken $ item '\'' *> satisfy ((<>) '\'') <* item '\'') <|>
-	(lexOp "::" DoubleColonToken) <|>
-	(lexOp "!=" NotEqualToken) <|>
-	(lexOp "<=" LesserEqToken) <|>
-	(lexOp ">=" GreaterEqToken) <|>
-	(lexOp "==" EqualsToken) <|>
-	(lexOp "&&" AmpersandsToken) <|>
-	(lexOp "||" PipesToken) <|>
-	(lexOp "[]" EmptyListToken) <|>
-	(lexOp "->" ArrowToken) <|>
-	(lexOp "(" BraceOpenToken) <|>
-	(lexOp ")" BraceCloseToken) <|>
-	(lexOp "{" CBraceOpenToken) <|>
-	(lexOp "}" CBraceCloseToken) <|>
-	(lexOp "[" SquareOpenToken) <|>
-	(lexOp "]" SquareCloseToken) <|>
-	(lexOp "," CommaToken) <|>
-	(lexOp ":" ColonToken) <|>
-	(lexOp ";" SColonToken) <|>
-	(lexOp "." DotToken) <|>
-	(lexOp "+" PlusToken) <|>
-	(lexOp "*" StarToken) <|>
-	(lexOp "/" SlashToken) <|>
-	(lexOp "%" PercentToken) <|>
-	(lexOp "=" AssignmentToken) <|>
-	(lexOp "<" LesserToken) <|>
-	(lexOp ">" BiggerToken) <|>
-	(lexOp "!" ExclamationToken) <|>
-	(lexOp "-" DashToken) <|>
-	//Numbers
-	(liftM (NumberToken o toInt o toString) $ some $ satisfy isDigit) <|>
-	//Identifiersr
-	(liftM IdentToken $ some $ satisfy isIdentChar) <|>
-	(satisfy isSpace >>| lexToken)
-
-lexEscape = (
-	lexOp "a" (toChar 7) <|>
-	lexOp "b" '\b' <|>
-	lexOp "f" '\f' <|>
-	lexOp "n" '\n' <|>
-	lexOp "r" '\t' <|>
-	lexOp "v" '\v' <|>
-	lexOp "'" '\''
-	) <?> ("Unknown escape", 0)
-
-lexKw :: String a -> Parser Char a
-lexKw kw tv = list (fromString kw) <* check (not o isIdentChar) >>| pure tv
-
-lexOp :: String a -> Parser Char a
-lexOp s tv = list (fromString s) >>| pure tv
-
-isIdentChar :: Char -> Bool
-isIdentChar c = isAlphanum c || c == '_'
+    //Comments
+    (list (fromString "//") >>| lexUntilNL >>| pure Nothing) <|>
+    (list (fromString "/*") >>| lexUntilCommentClose >>| pure Nothing) <|>
+	//Keyword tokens
+	lexKw "var" VarToken <|>
+	lexKw "Void" VoidToken <|>
+	lexKw "return" ReturnToken <|>
+	lexKw "if" IfToken <|>
+	lexKw "else" ElseToken <|>
+	lexKw "while" WhileToken <|>
+	lexKw "True" TrueToken <|>
+	lexKw "False" FalseToken <|>
+	lexKw "Int" IntTypeToken <|>
+	lexKw "Bool" BoolTypeToken <|>
+	lexKw "Char" CharTypeToken <|>
+	//Escape chars tokens
+	liftM (Just o CharToken)
+		(list (fromString "'\\") *> lexEscape <* item '\'') <|>
+	//Normal chars tokens
+	liftM (Just o CharToken)
+		(item '\'' *> satisfy ((<>) '\'') <* item '\'') <|>
+	//Two char ops tokens
+	lexOp "::" DoubleColonToken <|> lexOp "!=" NotEqualToken <|>
+	lexOp "<=" LesserEqToken <|> lexOp ">=" GreaterEqToken <|>
+	lexOp "==" EqualsToken <|> lexOp "&&" AmpersandsToken <|>
+	lexOp "||" PipesToken <|> lexOp "[]" EmptyListToken <|>
+	lexOp "->" ArrowToken <|> 
+	//One char ops tokens
+    lexOp "(" BraceOpenToken <|>
+	lexOp ")" BraceCloseToken <|> lexOp "{" CBraceOpenToken <|>
+	lexOp "}" CBraceCloseToken <|> lexOp "[" SquareOpenToken <|>
+	lexOp "]" SquareCloseToken <|> lexOp "," CommaToken <|>
+	lexOp ":" ColonToken <|> lexOp ";" SColonToken <|>
+	lexOp "." DotToken <|> lexOp "+" PlusToken <|>
+	lexOp "*" StarToken <|> lexOp "/" SlashToken <|>
+	lexOp "%" PercentToken <|> lexOp "=" AssignmentToken <|>
+	lexOp "<" LesserToken <|> lexOp ">" BiggerToken <|>
+	lexOp "!" ExclamationToken <|> lexOp "-" DashToken <|>
+	//Number tokens
+	liftM (Just o NumberToken o toInt o toString) (some $ satisfy isDigit) <|>
+	//Ident tokens
+	liftM (Just o IdentToken o toString) (some $ satisfy isIdentChar) <|>
+	(satisfy isSpace >>| pure Nothing)
+	where
+		lexUntilNL = top until (eof <|> (item '\n' >>| pure Void))
+		lexUntilCommentClose = top until (list (fromString "*/"))
+		isIdentChar c = isAlphanum c || c == '_'
+		lexOp s tv = list (fromString s) >>| pure (Just tv)
+		lexKw kw tv = lexOp kw tv <* check (not o isIdentChar)
+		lexEscape = fromJust <$> ((
+			lexOp "a" (toChar 7) <|> lexOp "b" '\b' <|> lexOp "f" '\f' <|>
+			lexOp "n" '\n' <|> lexOp "r" '\t' <|> lexOp "v" '\v' <|>
+			lexOp "'" '\'') <?> ("Unknown escape", 0))