Changeset 51b5a02

Timestamp:

Feb 4, 2018, 12:21:38 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

bf7b6015, cbe477e

Parents:

d03fa6d

Message:

adjust macros

File:

• doc/papers/general/Paper.tex (modified) (8 diffs)

doc/papers/general/Paper.tex

@@ -130 +130 @@
 
 \lstnewenvironment{cfa}[1][]
-{\CFA\lstset{#1}}
+{\lstset{#1}}
 {}
 \lstnewenvironment{C++}[1][]                            % use C++ style
-{\lstset{language=C++,moredelim=**[is][\protect\color{red}]{`}{`},#1}}
+{\lstset{language=C++,moredelim=**[is][\protect\color{red}]{`}{`},#1}\lstset{#1}}
 {}
 
@@ -946 +946 @@
 \begin{tabular}{@{\hspace{\parindentlnth}}l@{\hspace{\parindentlnth}}l@{\hspace{\parindentlnth}}l@{}}
 \multicolumn{1}{@{\hspace{\parindentlnth}}c@{\hspace{\parindentlnth}}}{\textbf{\CFA}}   & \multicolumn{1}{@{\hspace{\parindentlnth}}c}{\textbf{C}}      \\
-\begin{lstlisting}
+\begin{cfa}
 `LC:` {
         ... $declarations$ ...
@@ -968 +968 @@
         } // switch
 } // compound
-\end{lstlisting}
+\end{cfa}
 &
-\begin{lstlisting}
+\begin{cfa}
 {
         ... $declarations$ ...
@@ -992 +992 @@
         } `LS:` ;
 } `LC:` ;
-\end{lstlisting}
+\end{cfa}
 &
-\begin{lstlisting}
+\begin{cfa}
 
 
@@ -1016 +1016 @@
 
 
-\end{lstlisting}
+\end{cfa}
 \end{tabular}
 \lstMakeShortInline@%
@@ -1055 +1055 @@
         int i, j;
         int mem() {                                     $\C{\color{red}// implicit "this" parameter}$
-                i = 1;                                  $\C{\color{red}// this->i}$
-                j = 2;                                  $\C{\color{red}// this->j}$
+                i = 1;                                  $\C{\color{red}// this-{\textgreater}i}$
+                j = 2;                                  $\C{\color{red}// this-{\textgreater}j}$
         }
 }
 \end{C++}
-Since CFA is non-object-oriented, the equivalent object-oriented program looks like:
+Since \CFA is non-object-oriented, the equivalent object-oriented program looks like:
 \begin{cfa}
 struct S { int i, j; };
@@ -1188 +1188 @@
 
 {\lstset{language=CFA,deletedelim=**[is][]{`}{`},moredelim=**[is][\color{red}]{@}{@}}
-\begin{lstlisting}
+\begin{cfa}
 struct Weight { double stones; };
 
@@ -1208 +1208 @@
         w = 5@`st@ + 8@`kg@ + 25@`lb@ + hw;
 }
-\end{lstlisting}
+\end{cfa}
 }%