# HG changeset patch # User Christian Urban # Date 1385139411 0 # Node ID f54972b0f641d5e5a594517abee926b241b2d12d # Parent 6622bd25602900c1ed050bc7f040604997d0424a added diff -r 6622bd256029 -r f54972b0f641 coursework/cw02.pdf Binary file coursework/cw02.pdf has changed diff -r 6622bd256029 -r f54972b0f641 coursework/cw02.tex --- a/coursework/cw02.tex Tue Nov 19 23:44:49 2013 +0000 +++ b/coursework/cw02.tex Fri Nov 22 16:56:51 2013 +0000 @@ -62,6 +62,11 @@ \section*{Coursework 2} +{\bf UPDATE:} There was a typo in Q1 about the regular expressions for comments: +they should, of course, start with $\slash\slash$, as in C for example, not with +$\backslash\backslash$.\bigskip\bigskip + +\noindent This coursework is worth 3\% and is due on 27 November at 16:00. You are asked to \begin{enumerate} @@ -101,7 +106,7 @@ \item parentheses are \texttt{(}, \texttt{\{}, \texttt{)} and \texttt{\}} \item there are semicolons \texttt{;} \item whitespaces are either \texttt{" "} or \texttt{$\backslash$n} -\item comments either start with $\backslash\,\backslash$ and run to the end of the corresponding line +\item comments either start with $\slash\,\slash$ and run to the end of the corresponding line (indicated by \texttt{$\backslash$n}), or they can also run over several lines but then need to be enclosed by $\slash\texttt{*}$ as the beginning marker and $\texttt{*}\slash{}$\smallskip as the end marker \item identifiers are letters followed by underscores \texttt{\_\!\_}, letters diff -r 6622bd256029 -r f54972b0f641 progs/Matcher2.thy --- a/progs/Matcher2.thy Tue Nov 19 23:44:49 2013 +0000 +++ b/progs/Matcher2.thy Fri Nov 22 16:56:51 2013 +0000 @@ -299,5 +299,5 @@ by (induct s arbitrary: r) (simp_all add: nullable_correctness der_correctness Der_def) - +` end \ No newline at end of file