Index: doc/theses/fangren_yu_COOP_S20/Report.tex
===================================================================
--- doc/theses/fangren_yu_COOP_S20/Report.tex	(revision d7962de4fb7b30705c4d42d7596993cafee8f046)
+++ doc/theses/fangren_yu_COOP_S20/Report.tex	(revision 3e9de01f9f01858a79bc4958380f9d3027858d59)
@@ -40,10 +40,10 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\CFADefaults
+\CFAStyle												% CFA code-style for all languages
 \lstset{
-language=C++,											% make C++ the default language
+language=C++,moredelim=**[is][\color{red}]{@}{@}		% make C++ the default language
 }% lstset
 \lstnewenvironment{C++}[1][]                            % use C++ style
-{\lstset{language=C++,moredelim=**[is][\color{red}]{@}{@},#1}}{}
+{\lstset{language=C++,moredelim=**[is][\color{red}]{@}{@}}\lstset{#1}}{}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -88,5 +88,5 @@
 \section{Overview}
 
-cfa-cc is the reference compiler for the \CFA programming language, which is a non-object-oriented extension to C.
+@cfa-cc@ is the reference compiler for the \CFA programming language, which is a non-object-oriented extension to C.
 \CFA attempts to introduce productive modern programming language features to C while maintaining as much backward-compatibility as possible, so that most existing C programs can seamlessly work with \CFA.