# HG changeset patch
# User Christian Urban <christian dot urban at kcl dot ac dot uk>
# Date 1382706807 -3600
# Node ID df229ec49b227f957cbf91c0cf20ead2d1935580
# Parent  a2d792ed768e9448ae2bd513602ac97d4c9f08cb
added ho

diff -r a2d792ed768e -r df229ec49b22 handouts/ho05.pdf
Binary file handouts/ho05.pdf has changed
diff -r a2d792ed768e -r df229ec49b22 handouts/ho05.tex
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/handouts/ho05.tex	Fri Oct 25 14:13:27 2013 +0100
@@ -0,0 +1,69 @@
+\documentclass{article}
+\usepackage{charter}
+\usepackage{hyperref}
+\usepackage{amssymb}
+\usepackage{amsmath}
+\usepackage[T1]{fontenc}
+\usepackage{listings}
+\usepackage{xcolor}
+\usepackage{tikz}
+\usetikzlibrary{arrows}
+\usetikzlibrary{automata}
+\usetikzlibrary{shapes}
+\usetikzlibrary{shadows}
+\usetikzlibrary{positioning}
+\usetikzlibrary{calc}
+\usetikzlibrary{fit}
+\usetikzlibrary{backgrounds}
+
+\newcommand{\dn}{\stackrel{\mbox{\scriptsize def}}{=}}%
+
+\definecolor{javared}{rgb}{0.6,0,0} % for strings
+\definecolor{javagreen}{rgb}{0.25,0.5,0.35} % comments
+\definecolor{javapurple}{rgb}{0.5,0,0.35} % keywords
+\definecolor{javadocblue}{rgb}{0.25,0.35,0.75} % javadoc
+
+\lstdefinelanguage{scala}{
+  morekeywords={abstract,case,catch,class,def,%
+    do,else,extends,false,final,finally,%
+    for,if,implicit,import,match,mixin,%
+    new,null,object,override,package,%
+    private,protected,requires,return,sealed,%
+    super,this,throw,trait,true,try,%
+    type,val,var,while,with,yield},
+  otherkeywords={=>,<-,<\%,<:,>:,\#,@},
+  sensitive=true,
+  morecomment=[l]{//},
+  morecomment=[n]{/*}{*/},
+  morestring=[b]",
+  morestring=[b]',
+  morestring=[b]"""
+}
+
+\lstset{language=Scala,
+	basicstyle=\ttfamily,
+	keywordstyle=\color{javapurple}\bfseries,
+	stringstyle=\color{javagreen},
+	commentstyle=\color{javagreen},
+	morecomment=[s][\color{javadocblue}]{/**}{*/},
+	numbers=left,
+	numberstyle=\tiny\color{black},
+	stepnumber=1,
+	numbersep=10pt,
+	tabsize=2,
+	showspaces=false,
+	showstringspaces=false}
+	
+\begin{document}
+
+\section*{Handout 5}
+
+
+
+
+\end{document}
+
+%%% Local Variables: 
+%%% mode: latex
+%%% TeX-master: t
+%%% End: 
diff -r a2d792ed768e -r df229ec49b22 slides/slides05.pdf
Binary file slides/slides05.pdf has changed
diff -r a2d792ed768e -r df229ec49b22 slides/slides05.tex
--- a/slides/slides05.tex	Wed Oct 23 07:28:23 2013 +0100
+++ b/slides/slides05.tex	Fri Oct 25 14:13:27 2013 +0100
@@ -576,11 +576,12 @@
 \begin{itemize}
 \item The star-case in our proof about the matcher needs the following lemma
 \begin{center}
-\bl{$Der\,c\,A^* = (Der c A)\,@\, A^*$}
+\bl{$Der\,c\,A^* = (Der\,c\,A)\,@\, A^*$}
 \end{center}
 \end{itemize}\bigskip\bigskip
 
 \begin{itemize}
+\item \bl{$A^* = \{""\} \cup A\,@\,A^*$}
 \item If \bl{\texttt{""} $\in A$}, then\\ \bl{$Der\,c\,(A @ B) = (Der\,c\,A) @ B \cup (Der\,c\,B)$}\medskip
 \item If \bl{\texttt{""} $\not\in A$}, then\\ \bl{$Der\,c\,(A @ B) = (Der\,c\,A) @ B$}
 
diff -r a2d792ed768e -r df229ec49b22 slides/slides09.tex
--- a/slides/slides09.tex	Wed Oct 23 07:28:23 2013 +0100
+++ b/slides/slides09.tex	Fri Oct 25 14:13:27 2013 +0100
@@ -517,7 +517,7 @@
 \begin{frame}[t]
 \frametitle{\begin{tabular}{c}Compiling Ifs\end{tabular}}
 
-{\Large\bl{$\text{if}\;b\;\text{else}\;cs_1\;\text{then}\;cs_2$}}\bigskip\bigskip
+{\Large\bl{$\text{if}\;b\;\text{then}\;cs_1\;\text{else}\;cs_2$}}\bigskip\bigskip
 
 \onslide<2->{Case }\only<2>{{\bf True}:}\only<3>{{\bf False}:}