Minor edits to presentation

Author: espositoandrea

docs/documentation.tex

@@ -264,11 +264,11 @@ \section{Additions to the Syntax Given During Lectures}\label{sec:additions}
 		\node[state, initial] (q0) {$q_0$};
 	\node[state, accepting, right of=q0] (q1) {$q_1$};
 
-	\draw (q0) edge[loop above] node{$\ast - \texttt{"a"}$} (q0)
+	\draw (q0) edge[loop above] node{$\ast - \texttt{"\#"}$} (q0)
 	(q0) edge[above] node{\texttt{\#}} (q1)
 	(q1) edge[loop above] node{$\ast$} (q1);
 	\end{tikzpicture}
-	\caption[Finite state automaton to recognize comments]{Finite state automaton to recognize comments. The $\ast$ symbol denotes all characters. The notation $\ast - \texttt{"a"}$ denotes all characters except ``a''.}
+	\caption[Finite state automaton to recognize comments]{Finite state automaton to recognize comments. The $\ast$ symbol denotes all characters. The notation $\ast - \texttt{"\#"}$ denotes all characters except ``\#''.}
 	\label{fig:comment-automaton}
 \end{figure}
 

docs/presentation.tex

@@ -322,7 +322,7 @@ \section{The Environment}
 		\column{0.45\textwidth}
 		\small
 		\begin{itemize}
-			\item Variables have a name, a type (\texttt{int}) and a value
+			\item Variables have a name, a type (\texttt{int} or \texttt{str}) and a value
 			\item An environment is a set of variables
 			\item An environment can be updated by adding or modifying a
 				variable
@@ -385,8 +385,8 @@ \section{Implementation}
 				\end{itemize}
 			\item A parser is a Functor, meaning we can apply a function
 				\texttt{fmap}
-			\item A parser is an Applicative, meaning it can be applied
-				sequentially (discarding the previously computed results)
+			\item A parser is an Applicative, meaning we can apply functions
+				wrapped in parsers to values wrapped in parsers sequentially.
 		\end{itemize}
 		\column{0.65\textwidth}
 		\lstinputlisting[firstline=10,lastline=14]{Parser/Core.hs}
@@ -403,7 +403,7 @@ \section{Implementation}
 			\item A parser is a Monad, meaning we can sequentially apply
 				different parsers
 			\item A parser can also be defined as an \texttt{Alternative}, that
-				allows to use the syntax \lstinline{a <|> b} to express the
+				allows to use the syntax \lstinline!a <|> b! to express the
 				fact that the parser \texttt{b} should be applied if \texttt{a}
 				fails.
 		\end{itemize}
@@ -576,11 +576,11 @@ \section{Implementation}
 			\node[state, initial] (q0) {$q_0$};
 		\node[state, accepting, right of=q0] (q1) {$q_1$};
 
-		\draw (q0) edge[loop above] node{$\ast - \texttt{"a"}$} (q0)
+		\draw (q0) edge[loop above] node{$\ast - \texttt{"\#"}$} (q0)
 		(q0) edge[above] node{\texttt{\#}} (q1)
 		(q1) edge[loop above] node{$\ast$} (q1);
 		\end{tikzpicture}
-		\caption[Finite state automaton to recognize comments]{Finite state automaton to recognize comments. The $\ast$ symbol denotes all characters. The notation $\ast - \texttt{"a"}$ denotes all characters except ``a''.}
+		\caption[Finite state automaton to recognize comments]{Finite state automaton to recognize comments. The $\ast$ symbol denotes all characters. The notation $\ast - \texttt{"\#"}$ denotes all characters except ``\#''.}
 		\label{fig:comment-automaton}
 	\end{figure}
 \end{frame}

src/Parser/Bexp.hs

@@ -9,9 +9,9 @@ bexp :: Parser Bool
 bexp = do x <- bterm
           symbol "or"
           if x
-            then do R.bterm
+            then do R.bexp
                     return x
-            else do y <- bterm
+            else do y <- bexp
                     return $ x || y
        <|> bterm