Changeset 3f7e12cb for doc/LaTeXmacros/lstlang.sty

Timestamp:

Nov 8, 2017, 5:43:33 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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:

954908d

Parents:

78315272 (diff), e35f30a (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 plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• doc/LaTeXmacros/lstlang.sty (modified) (2 diffs)

doc/LaTeXmacros/lstlang.sty

@@ -2 +2 @@
 %%
 %% Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
-%% 
-%% lstlang.sty -- 
-%% 
+%%
+%% lstlang.sty --
+%%
 %% Author           : Peter A. Buhr
 %% Created On       : Sat May 13 16:34:42 2017
@@ -110 +110 @@
                 __attribute__, auto, _Bool, catch, catchResume, choose, _Complex, __complex, __complex__,
                 __const, __const__, disable, dtype, enable, __extension__, fallthrough, fallthru,
-                finally, forall, ftype, _Generic, _Imaginary, inline, __label__, lvalue, _Noreturn, one_t, 
-                otype, restrict, _Static_assert, throw, throwResume, trait, try, ttype, typeof, __typeof, 
-                __typeof__, virtual, waitfor, when, with, zero_t},
+                finally, forall, ftype, _Generic, _Imaginary, inline, __label__, lvalue, _Noreturn, one_t,
+                otype, restrict, _Static_assert, throw, throwResume, trait, try, ttype, typeof, __typeof,
+                __typeof__, virtual, with, zero_t},
         morekeywords=[2]{
-                _Atomic, coroutine, is_coroutine, is_monitor, is_thread, monitor, mutex, nomutex, 
-                resume, suspend, thread, _Thread_local, yield},
+                _Atomic, coroutine, is_coroutine, is_monitor, is_thread, monitor, mutex, nomutex, or,
+                resume, suspend, thread, _Thread_local, waitfor, when, yield},
         moredirectives={defined,include_next}%
 }