Ignore:
Timestamp:
Mar 20, 2018, 4:22:15 PM (6 years ago)
Author:
Rob Schluntz <rschlunt@…>
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:
101a4d2
Parents:
1bdd261 (diff), f810e09 (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' into references

File:
1 edited

Legend:

Unmodified
Added
Removed
  • doc/LaTeXmacros/lstlang.sty

    r1bdd261 r8669cd3  
    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 Mar 16 22:18:12 2018
     11%% Update Count     : 16
    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,
Note: See TracChangeset for help on using the changeset viewer.