# HG changeset patch
# User Christian Urban <christian.urban@kcl.ac.uk>
# Date 1634680311 -3600
# Node ID c24d16c89c48b28fa4284a2d2c6bd5d1c06fa857
# Parent  6af90edc50863be2acad4d886458d6379983ce6c
updated

diff -r 6af90edc5086 -r c24d16c89c48 progs/lexer/lex.sc
--- a/progs/lexer/lex.sc	Tue Oct 19 22:49:14 2021 +0100
+++ b/progs/lexer/lex.sc	Tue Oct 19 22:51:51 2021 +0100
@@ -157,7 +157,7 @@
 val KEYWORD : Rexp = "skip" | "while" | "do" | "if" | "then" | "else" | "read" | "write" 
 val SEMI: Rexp = ";"
 val OP: Rexp = ":=" | "=" | "-" | "+" | "*" | "!=" | "<" | ">"
-val WHITESPACE = PLUS(" " | "\n" | "\t")
+val WHITESPACE = PLUS(" " | "\n" | "\t" | "\r")
 val RPAREN: Rexp = "}"
 val LPAREN: Rexp = "{"
 val STRING: Rexp = "\"" ~ SYM.% ~ "\""
diff -r 6af90edc5086 -r c24d16c89c48 progs/lexer/lexer.sc
--- a/progs/lexer/lexer.sc	Tue Oct 19 22:49:14 2021 +0100
+++ b/progs/lexer/lexer.sc	Tue Oct 19 22:51:51 2021 +0100
@@ -204,7 +204,7 @@
 val KEYWORD : Rexp = "skip" | "while" | "do" | "if" | "then" | "else" | "read" | "write" 
 val SEMI: Rexp = ";"
 val OP: Rexp = ":=" | "=" | "-" | "+" | "*" | "!=" | "<" | ">"
-val WHITESPACE = PLUS(" " | "\n" | "\t")
+val WHITESPACE = PLUS(" " | "\n" | "\t" | "\r")
 val RPAREN: Rexp = "{"
 val LPAREN: Rexp = "}"
 val STRING: Rexp = "\"" ~ SYM.% ~ "\""