Changeset 8669cd3


Ignore:
Timestamp:
Mar 20, 2018, 4:22:15 PM (8 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

Files:
206 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • doc/LaTeXmacros/common.tex

    r1bdd261 r8669cd3  
    1111%% Created On       : Sat Apr  9 10:06:17 2016
    1212%% Last Modified By : Peter A. Buhr
    13 %% Last Modified On : Thu Mar 15 09:52:27 2018
    14 %% Update Count     : 378
     13%% Last Modified On : Mon Mar 19 17:18:23 2018
     14%% Update Count     : 379
    1515%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    1616
    … …  
    101101% index macros
    102102\newcommand{\italic}[1]{\emph{\hyperpage{#1}}}
     103\newcommand{\Definition}[1]{\textbf{\hyperpage{#1}}}
    103104\newcommand{\see}[1]{\emph{see}~#1}
    104105
    … …  
    113114\def\impl{\@bsphack\begingroup
    114115          \def\protect##1{\string##1\space}\@sanitize
    115           \@wrxref{|definition}}
     116          \@wrxref{|Definition}}
    116117\newcommand{\indexcode}[1]{{\lstinline$#1$}}
    117118\def\use{\@bsphack\begingroup
    … …  
    123124    \if@nobreak \ifvmode\nobreak\fi\fi\@esphack}
    124125%\newcommand{\use}[1]{\index{#1@{\lstinline$#1$}}}
    125 %\newcommand{\impl}[1]{\index{\protect#1@{\lstinline$\protect#1$}|definition}}
     126%\newcommand{\impl}[1]{\index{\protect#1@{\lstinline$\protect#1$}|Definition}}
    126127
    127128% inline text and lowercase index: \Index{inline and lowercase index text}

  • 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,

  • doc/bibliography/pl.bib

    r1bdd261 r8669cd3  
    886886@misc{Cforall,
    887887    key         = {Cforall},
    888     title       = {C$\forall$ Features},
     888    title       = {\textsf{C}{$\mathbf{\forall}$} Features},
    889889    howpublished= {\url{https://plg.uwaterloo.ca/~cforall/features}},
    890890    note        = {Accessed: 2018-01-01},
    … …  
    895895    contributer = {pabuhr@plg},
    896896    author      = {Rodolfo Gabriel Esteves},
    897     title       = {C$\forall$, a Study in Evolutionary Design in Programming Languages},
     897    title       = {\textsf{C}$\mathbf{\forall}$, a Study in Evolutionary Design in Programming Languages},
    898898    school      = {School of Computer Science, University of Waterloo},
    899899    year        = 2004,
    … …  
    10381038    contributer = {pabuhr@plg},
    10391039    author      = {Peter A. Buhr and Glen Ditchfield and David Till and Charles R. Zarnke},
    1040     title       = {{\mbox{\mdseries\sffamily C{$\mathbf{\forall}$}}}\ Users Guide, Version 0.1},
     1040    title       = {\textsf{C}$\mathbf{\forall}$ Users Guide, Version 0.1},
    10411041    institution = {Department of Computer Science, University of Waterloo},
    10421042    address     = {Waterloo, Ontario, Canada, N2L 3G1},
    … …  
    15511551@mastersthesis{Delisle18,
    15521552    author      = {Thierry Delisle },
    1553     title       = {Concurrency in {C}$\mathbf{\forall}$},
     1553    title       = {Concurrency in \textsf{C}$\mathbf{\forall}$},
    15541554    school      = {School of Computer Science, University of Waterloo},
    15551555    year        = 2018,
    … …  
    17171717    contributer = {a3moss@uwaterloo.ca},
    17181718    author      = {Glen Ditchfield},
    1719     title       = {Conversions for {Cforall}},
     1719    title       = {Conversions for \textsf{C}$\mathbf{\forall}$},
    17201720    note        = {\href{http://plg.uwaterloo.ca/~cforall/Conversions/index.html}{http://\-plg.uwaterloo.ca/\-\textasciitilde cforall/\-Conversions/\-index.html}},
    17211721    month       = {Nov},
    … …  
    33953395    contributer = {pabuhr@plg},
    33963396    author      = {Richard C. Bilson},
    3397     title       = {Implementing Overloading and Polymorphism in Cforall},
     3397    title       = {Implementing Overloading and Polymorphism in \textsf{C}$\mathbf{\forall}$},
    33983398    school      = {School of Computer Science, University of Waterloo},
    33993399    year        = 2003,
    … …  
    59285928
    59295929@mastersthesis{Schluntz17,
     5930    keywords    = {constructors, destructors, tuples},
    59305931    author      = {Robert Schluntz},
    5931     title       = {Resource Management and Tuples in {C}$\mathbf{\forall}$},
     5932    title       = {Resource Management and Tuples in \textsf{C}$\mathbf{\forall}$},
    59325933    school      = {School of Computer Science, University of Waterloo},
    59335934    year        = 2017,

  • doc/papers/concurrency/AMA/AMA-stix/ama/WileyNJD-AMA.bst

    r1bdd261 r8669cd3  
    361361{ year empty$
    362362    { "" }
    363     { "" * year }
     363    { " " * year }
    364364  if$
    365365}
    … …  
    501501    { "In: "
    502502      editor empty$
    503     'skip$
    504     { " " * format.editors * " " * booktitle emphasize * ", " * }
     503      { booktitle emphasize * }
     504      { " " * format.editors * " " * booktitle emphasize * ", " * }
    505505      if$
    506506    }
    … …  
    819819  crossref missing$
    820820    { format.in.ed.booktitle "booktitle" output.check
     821      blank.sep
    821822      format.bvolume output
    822823      format.number.series output
     824      new.block
    823825      format.pages output
    824826      organization output
    … …  
    841843{ output.bibitem
    842844  author empty$
    843     { organization empty$
    844     'skip$
    845     { organization output.nonnull
    846       address output
     845    { new.block organization empty$
     846    'skip$
     847    { new.block organization output.nonnull
     848      new.block address output
    847849    }
    848850      if$
    … …  
    852854  format.btitle "title" output.check
    853855  author empty$
    854     { organization empty$
    855     { address new.block.checka
     856    { new.block organization empty$
     857    { new.block address new.block.checka
    856858      address output
    857859    }
    … …  
    859861      if$
    860862    }
    861     { organization address new.block.checkb
     863    { new.block organization new.block address new.block.checkb
    862864      organization output
    863865      address output
    864866    }
    865867  if$
     868  new.block
    866869  format.edition output
     870  new.block
    867871  format.date output
    868872  new.block
    … …  
    877881  blank.sep
    878882  "Master's thesis" format.thesis.type output.nonnull
     883  new.block
    879884  school "school" output.check
    880885  address output
    … …  
    907912  if$
    908913  howpublished output
     914  new.block
    909915  format.note output
    910   %%new.block
     916  new.block
    911917  format.date output
    912918  fin.entry

  • src/Parser/parser.yy

    r1bdd261 r8669cd3  
    535535                { $$ = new ExpressionNode( build_compoundLiteral( $2, new InitializerNode( $5, true ) ) ); }
    536536        | '(' type_no_function ')' '@' '{' initializer_list comma_opt '}' // CFA, explicit C compound-literal
    537                 { SemanticError( yylloc, "explicit C compound-literal is currently unimplemented." ); $$ = nullptr; } // FIX ME
     537                { $$ = new ExpressionNode( build_compoundLiteral( $2, (new InitializerNode( $6, true ))->set_maybeConstructed( false ) ) ); }
    538538        | '^' primary_expression '{' argument_expression_list '}' // CFA
    539539                {
Note: See TracChangeset for help on using the changeset viewer.