Changeset d6fb3c7

Timestamp:

May 30, 2017, 11:47:09 AM (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:

759908f, b78275b

Parents:

55f5c59 (diff), 5e8d732 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Peter A. Buhr <pabuhr@…> (05/30/17 11:44:57)

git-committer:

Peter A. Buhr <pabuhr@…> (05/30/17 11:47:09)

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Location:

doc

Files:

• LaTeXmacros/lstlang.sty (modified) (1 diff)
• proposals/concurrency/style/cfa-format.tex (modified) (3 diffs)
• user/user.tex (modified) (2 diffs)

doc/LaTeXmacros/lstlang.sty

@@ -114 +114 @@
                 __typeof__, zero_t},
         morekeywords=[2]{
-                accept, _Atomic, coroutine, is_coroutine, is_monitor, is_thread, monitor, mutex, nomutex, 
-                resume, signal, signal_block, suspend, thread, _Thread_local, wait, yield},
+                _Atomic, coroutine, is_coroutine, is_monitor, is_thread, monitor, mutex, nomutex, 
+                resume, suspend, thread, _Thread_local, yield},
 }
 

doc/proposals/concurrency/style/cfa-format.tex

@@ -145 +145 @@
 }
 
+\lstdefinestyle{cfaStyle}{
+  escapeinside={@@},
+  basicstyle=\linespread{0.9}\tt\footnotesize,          % reduce line spacing and use typewriter font
+  keywordstyle=\bfseries\color{blue},
+  keywordstyle=[2]\bfseries\color{Plum},
+  commentstyle=\itshape\color{OliveGreen},                  % green and italic comments
+  identifierstyle=\color{identifierCol},
+  stringstyle=\sf\color{Mahogany},                                % use sanserif font
+  mathescape=true,
+  columns=fixed,
+  aboveskip=4pt,                                  % spacing above/below code block
+  belowskip=3pt,
+  keepspaces=true,
+  % frame=lines,
+  literate=,
+  showlines=true,                                 % show blank lines at end of code
+  showspaces=false,
+  showstringspaces=false,
+  escapechar=\$,
+  xleftmargin=\parindentlnth,                     % indent code to paragraph indentation
+  moredelim=[is][\color{red}\bfseries]{**R**}{**R**},    % red highlighting
+  morekeywords=[2]{accept, signal, signal_block, wait},
+}
+
 \lstMakeShortInline[basewidth=0.5em,breaklines=true,basicstyle=\normalsize\ttfamily\color{basicCol}]@  % single-character for \lstinline
 
@@ -158 +182 @@
   \lstset{
     language = CFA,
-    style=defaultStyle,
+    style=cfaStyle,
     #1
   }
@@ -230 +254 @@
 \newcommand{\one}{\lstinline{one_t}\xspace}
 \newcommand{\ateq}{\lstinline{\@=}\xspace}
-\newcommand{\code}[1]{\lstinline[language=CFA,style=defaultStyle]{#1}}
+\newcommand{\code}[1]{\lstinline[language=CFA,style=cfaStyle]{#1}}
 \newcommand{\pscode}[1]{\lstinline[language=pseudo,style=pseudoStyle]{#1}}

doc/user/user.tex

@@ -11 +11 @@
 %% Created On       : Wed Apr  6 14:53:29 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Tue May 30 11:42:47 2017
-%% Update Count     : 2097
+%% Last Modified On : Tue May 30 11:45:46 2017
+%% Update Count     : 2098
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -5164 +5164 @@
 \Celeven prescribes the following standard header-files~\cite[\S~7.1.2]{C11} and \CFA adds to this list:
 \begin{quote2}
-\lstset{deletekeywords={float},deletekeywords=[2]{signal}}
+\lstset{deletekeywords={float}}
 \begin{tabular}{@{}llll|l@{}}
 \multicolumn{4}{c|}{C11} & \multicolumn{1}{c}{\CFA}             \\