X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=lex.icl;h=2eeb6007c23d2b4188797f98b68937d25c1ec0a4;hb=889d4798a0da64d76422da98378f5e5c35f0bf32;hp=aa50e7257f097b661b340763785d1f4a1a09c1aa;hpb=98144e50ff2ca8e8d89dd1a39d4f2a41c2c6dab6;p=cc1516.git diff --git a/lex.icl b/lex.icl index aa50e72..2eeb600 100644 --- a/lex.icl +++ b/lex.icl @@ -55,6 +55,7 @@ lex ['C':'h':'a':'r':rest] = (Right CharTypeToken, rest) lex ['B':'o':'o':'l':rest] = (Right BoolTypeToken, rest) //Two character tokens lex [':':':':rest] = (Right DoubleColonToken, rest) +lex ['!':'=':rest] = (Right NotEqualToken, rest) lex ['<':'=':rest] = (Right LesserEqToken, rest) lex ['>':'=':rest] = (Right GreaterEqToken, rest) lex ['=':'=':rest] = (Right EqualsToken, rest) @@ -115,7 +116,7 @@ print i [(CharToken c):rest] = ["'":toString c:"'":print i rest] print i [VarToken:rest] = ["var ":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 [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] @@ -124,6 +125,7 @@ print i [IntTypeToken:rest] = ["Int":print i rest] print i [CharTypeToken:rest] = ["Char":print i rest] print i [BoolTypeToken:rest] = ["Bool":print i rest] print i [DoubleColonToken:rest] = [" :: ":print i rest] +print i [NotEqualToken: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]