# HG changeset patch
# User Christian Urban <christian.urban@kcl.ac.uk>
# Date 1634684818 -3600
# Node ID da2320360f128182150baf58484d0d5d95915ee1
# Parent  3a535de228165ed036f7551ae951f944b9e25bb5
updated

diff -r 3a535de22816 -r da2320360f12 progs/fun/fun_tokens.sc
--- a/progs/fun/fun_tokens.sc	Tue Oct 19 22:51:51 2021 +0100
+++ b/progs/fun/fun_tokens.sc	Wed Oct 20 00:06:58 2021 +0100
@@ -198,7 +198,7 @@
 val KEYWORD : Rexp = "if" | "then" | "else" | "write" | "def"
 val SEMI: Rexp = ";"
 val OP: Rexp = "=" | "==" | "-" | "+" | "*" | "!=" | "<" | ">" | "<=" | ">=" | "%" | "/"
-val WHITESPACE = PLUS(" " | "\n" | "\t")
+val WHITESPACE = PLUS(" " | "\n" | "\t" | "\r")
 val RPAREN: Rexp = ")"
 val LPAREN: Rexp = "("
 val COMMA: Rexp = ","
diff -r 3a535de22816 -r da2320360f12 slides/slides03.pdf
Binary file slides/slides03.pdf has changed
diff -r 3a535de22816 -r da2320360f12 slides/slides03.tex
--- a/slides/slides03.tex	Tue Oct 19 22:51:51 2021 +0100
+++ b/slides/slides03.tex	Wed Oct 20 00:06:58 2021 +0100
@@ -1706,12 +1706,8 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-\begin{frame}[c]
-\frametitle{Housekeeping}  
-\begin{mybox3}{CW 2}
-  The deadline for CW2 is 6 November (thanks to Arshdeep Pareek
-  for pointing this out).
-\end{mybox3}
+\begin{frame}<1-15>[c]
+
 \end{frame}
 
 \begin{frame}[t]
diff -r 3a535de22816 -r da2320360f12 slides/slides04.pdf
Binary file slides/slides04.pdf has changed
diff -r 3a535de22816 -r da2320360f12 slides/slides04.tex
--- a/slides/slides04.tex	Tue Oct 19 22:51:51 2021 +0100
+++ b/slides/slides04.tex	Wed Oct 20 00:06:58 2021 +0100
@@ -1665,9 +1665,13 @@
 \end{mybox3}
 \end{frame}
 
-\begin{frame}<1-12>[c]
+\begin{frame}<1-18>[c]
 \end{frame}
 
+
+
+\end{document}
+
 \begin{frame}[c]
   \small
   \begin{itemize}
@@ -1724,8 +1728,6 @@
   \end{center}
 \end{frame}
 
-\end{document}
-
 %%% Local Variables:  
 %%% mode: latex
 %%% TeX-master: t