- Timestamp:
- Aug 1, 2016, 9:07:35 AM (8 years ago)
- Branches:
- ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
- Children:
- 79f64f1
- Parents:
- c45170a (diff), 08061589 (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. - Location:
- doc
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
doc/LaTeXmacros/common.tex
rc45170a r182fe1e 10 10 %% Author : Peter A. Buhr 11 11 %% Created On : Sat Apr 9 10:06:17 2016 12 <<<<<<< HEAD 12 13 %% Last Modified By : Peter A. Buhr 13 14 %% Last Modified On : Mon Aug 1 08:57:17 2016 14 15 %% Update Count : 223 16 ======= 17 %% Last Modified By : 18 %% Last Modified On : Sun Jul 31 07:22:50 2016 19 %% Update Count : 207 20 >>>>>>> 080615890f586cb9954c252b55cab47f52c25758 15 21 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 16 22 … … 227 233 morekeywords={_Alignas,_Alignof,__alignof,__alignof__,asm,__asm,__asm__,_At,_Atomic,__attribute,__attribute__,auto, 228 234 _Bool,catch,catchResume,choose,_Complex,__complex,__complex__,__const,__const__,disable,dtype,enable,__extension__, 229 fallthr u,finally,forall,ftype,_Generic,_Imaginary,inline,__label__,lvalue,_Noreturn,otype,restrict,_Static_assert,235 fallthrough,fallthru,finally,forall,ftype,_Generic,_Imaginary,inline,__label__,lvalue,_Noreturn,otype,restrict,_Static_assert, 230 236 _Thread_local,throw,throwResume,trait,try,typeof,__typeof,__typeof__,}, 231 237 }% -
doc/user/user.tex
rc45170a r182fe1e 10 10 %% Author : Peter A. Buhr 11 11 %% Created On : Wed Apr 6 14:53:29 2016 12 <<<<<<< HEAD 12 13 %% Last Modified By : Peter A. Buhr 13 14 %% Last Modified On : Mon Aug 1 08:43:49 2016 14 15 %% Update Count : 1270 16 ======= 17 %% Last Modified By : 18 %% Last Modified On : Sun Jul 31 07:27:55 2016 19 %% Update Count : 1254 20 >>>>>>> 080615890f586cb9954c252b55cab47f52c25758 15 21 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 16 22 … … 1795 1801 and there is only a medium amount of fall-through from one ©case© clause to the next, and most of these result from a list of case values executing common code, rather than a sequence of case actions that compound. 1796 1802 \end{itemize} 1797 These observations help to put the suggestedchanges to the ©switch© into perspective.1803 These observations help to put the \CFA changes to the ©switch© into perspective. 1798 1804 \begin{enumerate} 1799 1805 \item … … 1805 1811 still work. 1806 1812 Nevertheless, reversing the default action would have a non-trivial effect on case actions that compound, such as the above example of processing shell arguments. 1813 <<<<<<< HEAD 1807 1814 Therefore, to preserve backwards compatibility, it is necessary to introduce a new kind of ©switch© statement, called ©choose©, with no implicit fall-through semantics and an explicit fall-through if the last statement of a case-clause ends with the new keyword ©fallthru©, \eg: 1815 ======= 1816 Therefore, to preserve backwards compatibility, it is necessary to introduce a new kind of ©switch© statement, called ©choose©, with no implicit fall-through semantics and an explicit fall-through if the last statement of a case-clause ends with the new keyword ©fallthrough©/©fallthru©, e.g.: 1817 >>>>>>> 080615890f586cb9954c252b55cab47f52c25758 1808 1818 \begin{lstlisting} 1809 1819 ®choose® ( i ) { … … 4359 4369 4360 4370 4371 \section{New Keywowrds} 4372 4373 ©catch©, ©catchResume©, ©choose©, \quad ©disable©, ©dtype©, \quad ©enable©, \quad ©fallthrough©, ©fallthru©, ©finally©, ©forall©, ©ftype©, \quad ©lvalue©, \quad ©otype©, \quad ©throw©, ©throwResume©, ©trait©, ©try© 4374 4375 4361 4376 \section{Incompatible} 4362 4377
Note: See TracChangeset
for help on using the changeset viewer.