Changeset 182fe1e for doc

Timestamp:

Aug 1, 2016, 9:07:35 AM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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.

Message:

update switch documentation and LaTeX macros

Location:

doc

Files:

• LaTeXmacros/common.tex (modified) (2 diffs)
• user/user.tex (modified) (4 diffs)

doc/LaTeXmacros/common.tex

@@ -10 +10 @@
 %% Author           : Peter A. Buhr
 %% Created On       : Sat Apr  9 10:06:17 2016
+<<<<<<< HEAD
 %% Last Modified By : Peter A. Buhr
 %% Last Modified On : Mon Aug  1 08:57:17 2016
 %% Update Count     : 223
+=======
+%% Last Modified By : 
+%% Last Modified On : Sun Jul 31 07:22:50 2016
+%% Update Count     : 207
+>>>>>>> 080615890f586cb9954c252b55cab47f52c25758
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -227 +233 @@
         morekeywords={_Alignas,_Alignof,__alignof,__alignof__,asm,__asm,__asm__,_At,_Atomic,__attribute,__attribute__,auto,
                 _Bool,catch,catchResume,choose,_Complex,__complex,__complex__,__const,__const__,disable,dtype,enable,__extension__,
-                fallthru,finally,forall,ftype,_Generic,_Imaginary,inline,__label__,lvalue,_Noreturn,otype,restrict,_Static_assert,
+                fallthrough,fallthru,finally,forall,ftype,_Generic,_Imaginary,inline,__label__,lvalue,_Noreturn,otype,restrict,_Static_assert,
                 _Thread_local,throw,throwResume,trait,try,typeof,__typeof,__typeof__,},
 }%

doc/user/user.tex

@@ -10 +10 @@
 %% Author           : Peter A. Buhr
 %% Created On       : Wed Apr  6 14:53:29 2016
+<<<<<<< HEAD
 %% Last Modified By : Peter A. Buhr
 %% Last Modified On : Mon Aug  1 08:43:49 2016
 %% Update Count     : 1270
+=======
+%% Last Modified By : 
+%% Last Modified On : Sun Jul 31 07:27:55 2016
+%% Update Count     : 1254
+>>>>>>> 080615890f586cb9954c252b55cab47f52c25758
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -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.
 \end{itemize}
-These observations help to put the suggested changes to the ©switch© into perspective.
+These observations help to put the \CFA changes to the ©switch© into perspective.
 \begin{enumerate}
 \item
@@ -1805 +1811 @@
 still work.
 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.
+<<<<<<< HEAD
 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:
+=======
+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.:
+>>>>>>> 080615890f586cb9954c252b55cab47f52c25758
 \begin{lstlisting}
 ®choose® ( i ) {
@@ -4359 +4369 @@
 
 
+\section{New Keywowrds}
+
+©catch©, ©catchResume©, ©choose©, \quad ©disable©, ©dtype©, \quad ©enable©, \quad ©fallthrough©, ©fallthru©, ©finally©, ©forall©, ©ftype©, \quad ©lvalue©, \quad ©otype©, \quad ©throw©, ©throwResume©, ©trait©, ©try©
+
+
 \section{Incompatible}