Ignore:
Timestamp:
Apr 17, 2018, 12:01:09 PM (7 years ago)
Author:
Thierry Delisle <tdelisle@…>
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, with_gc
Children:
3265399
Parents:
b2fe1c9 (diff), 81bb114 (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:
1 edited

Legend:

Unmodified
Added
Removed
  • doc/LaTeXmacros/lstlang.sty

    rb2fe1c9 r32cab5b  
    88%% Created On       : Sat May 13 16:34:42 2017
    99%% Last Modified By : Peter A. Buhr
    10 %% Last Modified On : Wed Aug 30 22:11:14 2017
    11 %% Update Count     : 14
     10%% Last Modified On : Fri Apr  6 23:44:50 2018
     11%% Update Count     : 20
    1212%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    1313
     
    3131\lstdefinelanguage{sml} {
    3232        morekeywords= {
    33                 EQUAL, GREATER, LESS, NONE, SOME, abstraction, abstype, and, andalso, array, as, before, bool,
    34                 case, char, datatype, do, else, end, eqtype, exception, exn, false, fn, fun, functor, handle,
    35                 if, in, include, infix, infixr, int, let, list, local, nil, nonfix, not, o, of, op, open,
    36                 option, orelse, overload, print, raise, real, rec, ref, sharing, sig, signature, string, struct,
    37                 structure, substring, then, true, type, unit, val, vector, where, while, with, withtype, word
    38         },
    39         morestring=[b]",
    40         morecomment=[s]{(*}{*)},
     33                EQUAL, GREATER, LESS, NONE, SOME, abstraction, abstype, and, andalso, array, as, before,
     34                bool, case, char, datatype, do, else, end, eqtype, exception, exn, false, fn, fun, functor,
     35                handle, if, in, include, infix, infixr, int, let, list, local, nil, nonfix, not, o, of, op,
     36                open, option, orelse, overload, print, raise, real, rec, ref, sharing, sig, signature,
     37                string, struct, structure, substring, then, true, type, unit, val, vector, where, while,
     38                with, withtype, word
     39    },
     40    morestring=[b]",
     41    morecomment=[s]{(*}{*)},
    4142}
    4243
     
    8283
    8384\lstdefinelanguage{rust}{
     85        % Keywords
    8486        morekeywords=[1]{
    8587                abstract, alignof, as, become, box, break, const, continue, crate, do, else, enum, extern,
    86         false, final, fn, for, if, impl, in, let, loop, macro, match, mod, move, mut, offsetof,
    87         override, priv, proc, pub, pure, ref, return, Self, self, sizeof, static, struct, super,
    88         trait, true, type, typeof, unsafe, unsized, use, virtual, where, while, yield
     88                false, final, fn, for, if, impl, in, let, loop, macro, match, mod, move, mut, offsetof,
     89                override, priv, proc, pub, pure, ref, return, Self, self, sizeof, static, struct, super,
     90                trait, true, type, typeof, unsafe, unsized, use, virtual, where, while, yield
    8991        },
     92        % Strings
    9093        morestring=[b]{"},
     94        % Comments
    9195        comment=[l]{//},
    9296        morecomment=[s]{/*}{*/},
     97        % Options
    9398        sensitive=true
    9499}
    95100
    96 \lstdefinelanguage{Pseudo}{
     101\lstdefinelanguage{pseudo}{
    97102        morekeywords={string,uint,int,bool,float},
    98103        sensitive=true,
     
    107112\lstdefinelanguage{CFA}[ANSI]{C}{
    108113        morekeywords={
    109                 _Alignas, _Alignof, __alignof, __alignof__, asm, __asm, __asm__, _At, __attribute,
    110                 __attribute__, auto, _Bool, catch, catchResume, choose, _Complex, __complex, __complex__,
    111                 __const, __const__, disable, dtype, enable, __extension__, fallthrough, fallthru,
    112                 finally, forall, ftype, _Generic, _Imaginary, inline, __label__, lvalue, _Noreturn, one_t,
    113                 otype, restrict, _Static_assert, throw, throwResume, trait, try, ttype, typeof, __typeof,
    114                 __typeof__, virtual, with, zero_t},
    115         morekeywords=[2]{
    116                 _Atomic, coroutine, is_coroutine, is_monitor, is_thread, monitor, mutex, nomutex, or,
    117                 resume, suspend, thread, _Thread_local, waitfor, when, yield},
     114                _Alignas, _Alignof, __alignof, __alignof__, asm, __asm, __asm__, __attribute, __attribute__,
     115                auto, _Bool, catch, catchResume, choose, _Complex, __complex, __complex__, __const, __const__,
     116                coroutine, disable, dtype, enable, __extension__, exception, fallthrough, fallthru, finally,
     117                __float80, float80, __float128, float128, forall, ftype, _Generic, _Imaginary, __imag, __imag__,
     118                inline, __inline, __inline__, __int128, int128, __label__, monitor, mutex, _Noreturn, one_t, or,
     119                otype, restrict, __restrict, __restrict__, __signed, __signed__, _Static_assert, thread,
     120                _Thread_local, throw, throwResume, timeout, trait, try, ttype, typeof, __typeof, __typeof__,
     121                virtual, __volatile, __volatile__, waitfor, when, with, zero_t,
     122    },
    118123        moredirectives={defined,include_next}%
    119124}
Note: See TracChangeset for help on using the changeset viewer.