X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=lex.icl;h=a1912bf959b332f43a0a731d5009886716bf4827;hb=8de73bb36ae068011c2c1b1fc9b3c9091a897997;hp=1475a0efacbe9bf2450bc130e76d2de24bfb8a51;hpb=4b8ac77a88528dd1eeac43fd7a6c2e6ac711d5a9;p=cc1516.git

diff --git a/lex.icl b/lex.icl
index 1475a0e..a1912bf 100644
--- a/lex.icl
+++ b/lex.icl
@@ -6,26 +6,23 @@ import StdString
 import System.CommandLine
 import StdFile
 import StdMisc
+import StdBool
 from StdFunc import id, const
 import Data.Maybe
 import Control.Applicative
 import Control.Monad
 import Control.Monad.State
+import Data.Functor
 from Data.Func import $
-
-// Misschien moeten we hier continuation style van maken
-instance toString lexerOutput where
-	toString l = "dit is een lexer output, danwel error\n"
-
-lexer :: [Char] -> LexerOutput [Token]
-lexer _ = Left "Not Implemented"
+from Text import class Text, instance Text String
+import qualified Text
 
 Start :: *World -> *World
 Start w
 # (args, w) = getCommandLine w // We lezen nu nog standaard van stdin
 # (out, w) = stdio w
 # (toparse, out) = readEntireFile out
-# out = out <<< toString (lexer toparse)
+# out = out <<< print (lexer toparse)
 # (b, w) = fclose out w
 | not b = setReturnCode 1 w
 = w
@@ -37,66 +34,116 @@ Start w
 		# (cs, f) = readEntireFile f
 		= ([c:cs], f)
 
+lexer :: [Char] -> LexerOutput
+lexer [] = Right []
+lexer x = case lex x of
+	(Right t, rest) = lexer rest >>= \ts.Right [t:ts]
+	(Left e, _) = Left e
 
-
-// Clean adaption of Yard, a parsec like parser combinator
-:: Parser a = Parser ([Char] -> (LexerOutput a, [Char]))
-
-runParser :: (Parser a) [Char] -> (LexerOutput a, [Char])
-runParser (Parser p) s = p s
-
-instance Functor Parser where
-    fmap f s    = liftM f s
-
-instance Applicative Parser where
-    pure a      = Parser $ \s -> (Right a, s) 
-    (<*>) sf s  = ap sf s
-
-instance Monad Parser where
-    bind p f    = Parser $ \s -> let (out, rest) = runParser p s in case out of
-                    Left e  = (Left e, rest)
-                    Right t = runParser (f t) rest
-
-//gives us some, many and optional
-instance Alternative Parser where
-    empty       = zero
-    (<|>) p1 p2 = parserAlternative p1 p2
-parserAlternative p1 p2 = Parser $ \s -> let (out, rest) = runParser p1 s in case out of
-                            Left e  = runParser p2 s
-                            Right t = (Right t, rest)
-
-//parser that fails with error
-fail :: String -> Parser a
-fail e = Parser $ \s -> (Left e, s)
-
-//parser that always fails
-zero :: Parser a
-zero = fail "Zero parser"
-
-//matches exactly one Char
-item :: Parser Char
-item = Parser $ \s -> case s of 
-        []      = (Left "Unexpected empty input", s)
-        [x:xs]  = (Right x, xs)
-
-//matches any char which satisfies f
-satisfy :: (Char -> Bool) -> Parser Char
-satisfy f = item >>= (\r -> if (f r) (return r) zero)
-
-//tries a parser, if it fails returns a default value
-optionalDef :: a (Parser a) -> Parser a
-optionalDef def p = parserAlternative p (return def)
-
-//matched given char
-char :: Char -> Parser Char
-char c = satisfy (\i -> c==i) //I hate that we can't do: satisfy (==c)
-
-alpha :: Parser Char
-alpha = satisfy isAlpha
-
-digit :: Parser Char
-digit = satisfy isDigit
-
-//matches a given String
-string :: [Char] -> Parser [Char]
-string s = mapM_ char s >>| return s
\ No newline at end of file
+print :: LexerOutput -> String
+print (Left l) = "Error: " +++ l
+print (Right x) = 'Text'.concat (print` 0 x)
+	where
+		print` :: Int [Token] -> [String]
+		print` _ [] = []
+		print` i [(IdentToken l):rest] = [toString l:print` i rest]
+		print` i [(NumberToken j):rest] = [toString j:print` i rest]
+		print` i [(CharToken c):rest] = ["'":toString c:"'":print` i rest]
+		print` i [VarToken:rest] = ["var ":print` i rest]
+		print` i [VoidToken:rest] = ["Void":print` i rest]
+		print` i [ReturnToken:rest] = ["return":print` i rest]
+		print` i [IfToken:rest] = ["if":print` i rest]
+		print` i [ElseToken:rest] = ["else":print` i rest]
+		print` i [WhileToken:rest] = ["while":print` i rest]
+		print` i [TrueToken:rest] = ["True":print` i rest]
+		print` i [FalseToken:rest] = ["False":print` i rest]
+		print` i [BraceOpenToken:rest] = ["(":print` i rest]
+		print` i [BraceCloseToken:rest] = [")":print` i rest]
+		print` i [CBraceOpenToken:rest] = ["{\n":tab (i+1):print` (i+1) rest]
+		print` i [CBraceCloseToken:rest] = ["}\n":tab i:print` i rest]
+		print` i [SquareOpenToken:rest] = ["[":print` i rest]
+		print` i [SquareCloseToken:rest] = ["]":print` i rest]
+		print` i [CommaToken:rest] = [", ":print` i rest]
+		print` i [ColonToken:rest] = [":":print` i rest]
+		print` i [SColonToken:CBraceCloseToken:rest] =
+			[";\n":tab (i-1):"}\n":print` (i-1) rest]
+		print` i [SColonToken:rest] = [";\n":tab i:print` i rest]
+		print` i [DotToken:rest] = [".":print` i rest]
+		print` i [PlusToken:rest] = [" + ":print` i rest]
+		print` i [DashToken:rest] = [" - ":print` i rest]
+		print` i [StarToken:rest] = [" * ":print` i rest]
+		print` i [SlashToken:rest] = [" / ":print` i rest]
+		print` i [PercentToken:rest] = [" % ":print` i rest]
+		print` i [AssignmentToken:rest] = [" = ":print` i rest]
+		print` i [LesserToken:rest] = [" < ":print` i rest]
+		print` i [BiggerToken:rest] = [" > ":print` i rest]
+		print` i [ExclamationToken:rest] = ["!":print` i rest]
+		print` i [DoubleColonToken:rest] = [" :: ":print` i rest]
+		print` i [LesserEqToken:rest] = [" <= ":print` i rest]
+		print` i [GreaterEqToken:rest] = [" >= ":print` i rest]
+		print` i [EqualsToken:rest] = [" == ":print` i rest]
+		print` i [AmpersandsToken:rest] = [" && ":print` i rest]
+		print` i [PipesToken:rest] = [" || ":print` i rest]
+		print` i [ArrowToken:rest] = [" -> ":print` i rest]
+		print` i [EndOfFileToken:rest] = ["\n":print` i rest]
+
+tab :: Int -> String
+tab 0 = ""
+tab i = "\t" +++ tab (i-1)
+
+
+lex :: [Char] -> (Either String Token, [Char])
+lex [] = (Right EndOfFileToken, [])
+lex ['v':'a':'r':rest] = (Right VarToken, rest)
+lex ['V':'o':'i':'d':rest] = (Right VoidToken, rest)
+lex ['r':'e':'t':'u':'r':'n':rest] = (Right ReturnToken, rest)
+lex ['i':'f':rest] = (Right IfToken, rest)
+lex ['e':'l':'s':'e':rest] = (Right ElseToken, rest)
+lex ['w':'h':'i':'l':'e':rest] = (Right WhileToken, rest)
+lex ['T':'r':'u':'e':rest] = (Right TrueToken, rest)
+lex ['F':'a':'l':'s':'e':rest] = (Right FalseToken, rest)
+lex ['\'':'\\':x:'\'':rest] = case x of
+	'a' = (Right (CharToken (toChar 7)), rest) //Alarm
+	'b' = (Right (CharToken '\b'), rest) //Backspace
+	'f' = (Right (CharToken '\f'), rest) //Formfeed
+	'n' = (Right (CharToken '\n'), rest) //Newline
+	'r' = (Right (CharToken '\r'), rest) //Carriage Return
+	't' = (Right (CharToken '\t'), rest) //Horizontal tab
+	'v' = (Right (CharToken '\v'), rest) //Vertical tab
+	_ = (Left ("Unknown escape: \\" +++ toString x), rest)
+lex ['\'':x:'\'':rest] = (Right (CharToken x), rest)
+lex [':':':':rest] = (Right DoubleColonToken, rest)
+lex ['<':'=':rest] = (Right LesserEqToken, rest)
+lex ['>':'=':rest] = (Right GreaterEqToken, rest)
+lex ['=':'=':rest] = (Right EqualsToken, rest)
+lex ['&':'&':rest] = (Right AmpersandsToken, rest)
+lex ['|':'|':rest] = (Right PipesToken, rest)
+lex ['-':'>':rest] = (Right ArrowToken, rest)
+lex ['(':rest] = (Right BraceOpenToken, rest)
+lex [')':rest] = (Right BraceCloseToken, rest)
+lex ['{':rest] = (Right CBraceOpenToken, rest)
+lex ['}':rest] = (Right CBraceCloseToken, rest)
+lex ['[':rest] = (Right SquareOpenToken, rest)
+lex [']':rest] = (Right SquareCloseToken, rest)
+lex [',':rest] = (Right CommaToken, rest)
+lex [':':rest] = (Right ColonToken, rest)
+lex [';':rest] = (Right SColonToken, rest)
+lex ['.':rest] = (Right DotToken, rest)
+lex ['+':rest] = (Right PlusToken, rest)
+lex ['-':rest] = (Right DashToken, rest)
+lex ['*':rest] = (Right StarToken, rest)
+lex ['/':rest] = (Right SlashToken, rest)
+lex ['%':rest] = (Right PercentToken, rest)
+lex ['=':rest] = (Right AssignmentToken, rest)
+lex ['<':rest] = (Right LesserToken, rest)
+lex ['>':rest] = (Right BiggerToken, rest)
+lex ['!':rest] = (Right ExclamationToken, rest)
+lex [x:xs]
+| isSpace x = lex xs
+| isDigit x
+	# (is, rest) = span isDigit xs
+	= (Right (NumberToken [x:is]), rest)
+| isAlpha x
+	# (is, rest) = span (\c.isAlphanum c || c == '_') xs
+	= (Right (IdentToken [x:is]), rest)
+| otherwise = (Left ("Unexpected character: " +++ toString x), [])