Changeset 2ab67b9 for doc/proposals/concurrency/style/cfa-format.tex

Timestamp:

May 30, 2017, 7:49:45 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:

f3fc631f

Parents:

8f61052c (diff), 4a368547 (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.

Message:

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

File:

• doc/proposals/concurrency/style/cfa-format.tex (moved) (moved from doc/proposals/concurrency/cfa-format.tex) (4 diffs)

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

@@ -1 @@
-\usepackage{xcolor}
+\usepackage[usenames,dvipsnames]{xcolor}
 \usepackage{listings}
 \usepackage{inconsolata}
@@ -144 +144 @@
   % moredelim=** allows cumulative application
 }
-\lstset{
-  morekeywords=[2]{nomutex,mutex,thread,wait,wait_release,signal,signal_block,accept,monitor,suspend,resume,coroutine}
-  language = CFA,
-  style=defaultStyle
-}
+
 \lstMakeShortInline[basewidth=0.5em,breaklines=true,basicstyle=\normalsize\ttfamily\color{basicCol}]@  % single-character for \lstinline
 
-\lstnewenvironment{cfacode}[1][]{ %
-  \lstset{ %
-    language = CFA, %
-    style=defaultStyle, %
-    morekeywords=[2]{nomutex,mutex,thread,wait,signal,signal_block,accept,monitor,suspend,resume,coroutine}, %
-    #1 %
-  } %
+\lstnewenvironment{ccode}[1][]{
+  \lstset{
+    language = C,
+    style=defaultStyle,
+    #1
+  }
+}{}
+
+\lstnewenvironment{cfacode}[1][]{
+  \lstset{
+    language = CFA,
+    style=defaultStyle,
+    #1
+  }
 }{}
 
@@ -169 +172 @@
 
 \lstnewenvironment{cppcode}[1][]{
+  \lstset{
+    language = c++,
+    style=defaultStyle,
+    #1
+  }
+}{}
+
+\lstnewenvironment{ucppcode}[1][]{
   \lstset{
     language = c++,
@@ -219 +230 @@
 \newcommand{\one}{\lstinline{one_t}\xspace}
 \newcommand{\ateq}{\lstinline{\@=}\xspace}
+\newcommand{\code}[1]{\lstinline[language=CFA,style=defaultStyle]{#1}}
+\newcommand{\pscode}[1]{\lstinline[language=pseudo,style=pseudoStyle]{#1}}