Merge branch 'master' of https://github.com/dopefishh/cc1516

diff --combined deliverables/report/report.tex
index efd98e0,ce6f41c..248bcb2
--- 1/deliverables/report/report.tex
--- 2/deliverables/report/report.tex
+++ b/deliverables/report/report.tex
@@@ -5,7 -5,6 +5,7 @@@
  \usepackage{spl}
  \usepackage{hyperref}
  \usepackage[a4paper]{geometry}
 +\usepackage{proof}
  
  \title{Compiler Construction: SPL Compiler}
  \author{Pim Jager\and Mart Lubbers}
@@@ -18,11 -17,9 +18,12 @@@
  }
  
  \newcommand{\SPLC}{\texttt{SPLC}}
 -\newcommand{\SPL}{\texttt{SPLC}}
 -\newcommand{\SSM}{\texttt{SPLC}}
 +\newcommand{\SPL}{\texttt{SPL}}
 +\newcommand{\SSM}{\texttt{SSM}}
+ \newcommand{\Yard}{\textsc{Yard}}
 +\def\AST/{\texttt{AST}}
 +
 +\let\tt\texttt
  
  \begin{document}
  \maketitle
@@@ -39,4 -36,9 +40,9 @@@
  
  \input{ext.tex}
  
+ \newpage
+ \section{Appendices}
+ \subsection{Grammar}
+ \lstinputlisting[label={lst:grammar}{../../grammar/grammar.txt}
+ 
  \end{document}