--- a/coursework/cw03.tex Wed Nov 06 17:09:58 2019 +0000
+++ b/coursework/cw03.tex Wed Nov 06 21:52:42 2019 +0000
@@ -31,11 +31,12 @@
\begin{itemize}
\item arithmetic expressions (with the operations from the
- previous coursework, such as \pcode{+}, \pcode{*} and so on)
-\item boolean expressions (such as \pcode{<}, \code{!=} and
- so on)
-\item single statements (such as \pcode{skip}, assignments, \pcode{if}s,
- \pcode{while}-loops and so on)
+ previous coursework, that is \pcode{+}, \pcode{-}, \pcode{*},
+ \pcode{/} and \pcode{\%})
+\item boolean expressions (with the operations \pcode{==}, \pcode{<}, \pcode{>},
+ \code{!=}, \pcode{&&}, \pcode{||}, \pcode{true} and \pcode{false})
+\item single statements (that is \pcode{skip}, assignments, \pcode{if}s,
+ \pcode{while}-loops, \pcode{read} and \pcode{write})
\item compound statements separated by semicolons
\item blocks which are enclosed in curly parentheses
\end{itemize}
@@ -78,6 +79,7 @@
case object True extends BExp
case object False extends BExp
case class Bop(o: String, a1: AExp, a2: AExp) extends BExp
+case class Lop(o: String, b1: BExp, b2: BExp) extends BExp
\end{lstlisting}
\caption{The datatype for parse trees in Scala.\label{trees}}
\end{figure}