completed example, added != token

[cc1516.git] / lex.icl

diff --git a/lex.icl b/lex.icl
index aa50e72..2eeb600 100644 (file)
--- 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]