diff -r 23273e3a120f -r 2b11eb06af76 cws/cw05.tex --- a/cws/cw05.tex Fri Dec 03 21:56:55 2021 +0000 +++ b/cws/cw05.tex Fri Dec 03 22:07:11 2021 +0000 @@ -41,11 +41,11 @@ on my end. You will be marked according to the input files \begin{itemize} -\item\href{https://talisker.nms.kcl.ac.uk/cgi-bin/repos.cgi/afl-material/raw-file/tip/progs/fun2/sqr.fun}{sqr.fun} -\item\href{https://talisker.nms.kcl.ac.uk/cgi-bin/repos.cgi/afl-material/raw-file/tip/progs/fun2/fact.fun}{fact.fun} -\item\href{https://talisker.nms.kcl.ac.uk/cgi-bin/repos.cgi/afl-material/raw-file/tip/progs/fun2/mand.fun}{mand.fun} -\item\href{https://talisker.nms.kcl.ac.uk/cgi-bin/repos.cgi/afl-material/raw-file/tip/progs/fun2/mand2.fun}{mand2.fun} -\item\href{https://talisker.nms.kcl.ac.uk/cgi-bin/repos.cgi/afl-material/raw-file/tip/progs/fun2/hanoi.fun}{hanoi.fun} +\item\href{https://talisker.nms.kcl.ac.uk/cgi-bin/repos.cgi/afl-material/raw-file/tip/cwtests/cw05/sqr.fun}{sqr.fun} +\item\href{https://talisker.nms.kcl.ac.uk/cgi-bin/repos.cgi/afl-material/raw-file/tip/cwtests/cw05/fact.fun}{fact.fun} +\item\href{https://talisker.nms.kcl.ac.uk/cgi-bin/repos.cgi/afl-material/raw-file/tip/cwtests/cw05/mand.fun}{mand.fun} +\item\href{https://talisker.nms.kcl.ac.uk/cgi-bin/repos.cgi/afl-material/raw-file/tip/cwtests/cw05/mand2.fun}{mand2.fun} +\item\href{https://talisker.nms.kcl.ac.uk/cgi-bin/repos.cgi/afl-material/raw-file/tip/cwtests/cw05/hanoi.fun}{hanoi.fun} \end{itemize} \noindent @@ -115,7 +115,7 @@ case class Var(s: String) extends Exp case class Num(i: Int) extends Exp // integer numbers case class FNum(i: Float) extends Exp // floating numbers -case class ChConst(c: Int) extends Exp // char constant +case class ChConst(c: Int) extends Exp // char constants case class Aop(o: String, a1: Exp, a2: Exp) extends Exp case class Sequence(e1: Exp, e2: Exp) extends Exp case class Bop(o: String, a1: Exp, a2: Exp) extends BExp @@ -132,12 +132,12 @@ your LLVM-IR code by running it with the interpreter \texttt{lli}. \begin{figure}[t] -\lstinputlisting[language=Scala]{../progs/fun2/mand.fun} +\lstinputlisting[language=Scala]{../cwtests/cw05/mand.fun} \caption{The Mandelbrot program in the `typed' Fun-language.\label{mand}} \end{figure} \begin{figure}[t] -\includegraphics[scale=0.35]{../progs/fun2/out.png} +\includegraphics[scale=0.35]{../solution/cw5/out.png} \caption{Ascii output of the Mandelbrot program.\label{mand}} \end{figure}