Changeset ce6c57c

Timestamp:

Sep 19, 2015, 8:25:07 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, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

865249a

Parents:

2f9956b

Message:

simplify Makefile, add material on exception statements

Location:

doc/refrat

Files:

• Makefile (modified) (2 diffs)
• refrat.tex (modified) (13 diffs)

doc/refrat/Makefile

@@ -32 +32 @@
 
 clean :
-        rm -f *.bbl *.aux *.dvi *.idx *.ilg *.ind *.brf *.out *.log *.toc *.blg *.pstex_t ${FIGURES} ${PICTURES} ${PROGRAMS} ${GRAPHS} ${basename ${DOCUMENT}}.ps ${DOCUMENT}
+        rm -f *.bbl *.aux *.dvi *.idx *.ilg *.ind *.brf *.out *.log *.toc *.blg *.pstex_t \
+                ${FIGURES} ${PICTURES} ${PROGRAMS} ${GRAPHS} ${basename ${DOCUMENT}}.ps ${DOCUMENT}
 
 # File Dependencies #
@@ -42 +43 @@
         dvips $< -o $@
 
-${basename ${DOCUMENT}}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCE} ${basename ${DOCUMENT}}.bbl
+${basename ${DOCUMENT}}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCE} ${basename ${DOCUMENT}}.tex ${basename ${DOCUMENT}}.bib
+        # Conditionally create an empty *.ind (index) file for inclusion until makeindex is run.
+        if [ ! -r ${basename $@}.ind ] ; then touch ${basename $@}.ind ; fi
+        # Must have *.aux file containing citations for bibtex
+        if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename $@}.tex ; fi
+        -${BibTeX} ${basename $@}
+        # Some citations reference others so run steps again to resolve these citations
         ${LaTeX} ${basename $@}.tex
-        if fgrep -s "Label(s) may have changed" ${basename $@}.log ; then ${LaTeX} ${basename $@}.tex ; fi
+        -${BibTeX} ${basename $@}
+        # Make index from *.aux entries and input index at end of document
         makeindex -s indexstyle ${basename $@}.idx
         ${LaTeX} ${basename $@}.tex
-        ${LaTeX} ${basename $@}.tex             % to get index title in toc
-
-${basename ${DOCUMENT}}.bbl : ${basename ${DOCUMENT}}.tex ${basename ${DOCUMENT}}.bib
-        if [ ! -r ${basename $@}.ind ] ; then touch ${basename $@}.ind ; fi
-        if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename $@}.tex ; fi
-        -${BibTeX} ${basename $@}
+        # Run again to get index title into table of contents
         ${LaTeX} ${basename $@}.tex
-        -${BibTeX} ${basename $@}
 
 ## Define the default recipes.

doc/refrat/refrat.tex

@@ -2 +2 @@
 
 \documentclass[openright,twoside]{report}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% Latex packages used in the document.
+
 \usepackage{fullpage,times}
 \usepackage{xspace}
@@ -13 +17 @@
 \usepackage{breakurl}
 \urlstyle{sf}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% Names used in the document.
+
+\newcommand{\CFA}{Cforall\xspace}               % set language text name
+\newcommand{\CFAA}{C$\forall$\xspace}   % set language symbolic name
+\newcommand{\CC}{C\kern-.1em\hbox{+\kern-.25em+}\xspace} % CC symbolic name
+\def\c11{ISO/IEC C} % C11 name (cannot have numbers in latex command name)
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% Specialized macros used in the document.
 
 %\input code.sty
@@ -52 +69 @@
 \newcommand{\VPageref}[2][page]{\ifx#1\@empty\else{#1}\nobreakspace\fi\pageref{#2}}
 
-\newcommand{\CFA}{Cforall\xspace}
-\newcommand{\CFAA}{C$\forall$\xspace}
-\newcommand{\CC}{C\kern-.1em\hbox{+\kern-.25em+}\xspace}
-\def\c11{ISO/IEC C}% cannot have numbers in latex command name
-
 % replace/adjust characters that look bad in sanserif
 \makeatletter
@@ -63 +75 @@
 \lst@ProcessOther{"3C}{\lst@ttfamily{<}{\texttt{<}}} % replace less than
 \lst@ProcessOther{"3E}{\lst@ttfamily{<}{\texttt{>}}} % replace greater than
-\lst@ProcessOther{"5E}{$\sim$} % circumflex
+\lst@ProcessOther{"5E}{\raisebox{0.4ex}{$\scriptstyle\land\,$}} % circumflex
 \lst@ProcessLetter{"5F}{\lst@ttfamily{\char95}{{\makebox[1.2ex][c]{\rule{1ex}{0.1ex}}}}} % replace underscore
-\lst@ProcessOther{"7E}{\raisebox{-.4ex}[1ex][0pt]{\textasciitilde}} % lower tilde
+%\lst@ProcessOther{"7E}{\raisebox{-.4ex}[1ex][0pt]{\textasciitilde}} % lower tilde
+\lst@ProcessOther{"7E}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}} % lower tilde
 \@empty\z@\@empty
 
@@ -74 +87 @@
 
 \lstdefinelanguage{CFA}[ANSI]{C}%
-  {morekeywords={asm,_Atomic,catch,choose,_Complex,context,dtype,fallthru,forall,ftype,_Imaginary,lvalue,restrict,throw,try,type,},
+  {morekeywords={asm,_Atomic,catch,catchResume,choose,_Complex,context,disable,dtype,enable,
+        fallthru,finally,forall,ftype,_Imaginary,lvalue,restrict,throw,throwResume,try,type,},
 }
 
@@ -84 +98 @@
 xleftmargin=\parindent,
 escapechar=@,
+%fancyvrb=true,
 %showtabs=true,
-%tab=\rightarrowfill,
+keepspaces=true,
+showtabs=true,
+tab=,
 }
 
@@ -91 +108 @@
 \setcounter{tocdepth}{3}                % subsubsections in table of contents
 \makeindex
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \begin{document}
@@ -4036 +4055 @@
 \section{Statements and blocks}
 
+\begin{syntax}
+\oldlhs{statement}
+\rhs \nonterm{exception-statement}
+\end{syntax}
+
 Many statements contain expressions, which may have more than one interpretation. The following
 sections describe how the \CFA translator selects an interpretation. In all cases the result of the
@@ -4058 +4082 @@
 The following have identical meaning:
 \begin{lstlisting}
-case 1:@\ \ @case 2:@\ \ @case 3:@\ \ @case 4:@\ \ @case 5:
+case 1:  case 2:  case 3:  case 4:  case 5:
 case 1, 2, 3, 4, 5:
 case 1~5:
@@ -4067 +4091 @@
 \end{lstlisting}
 
-The \lstinline$case$ and \lstinline$default$ clauses are restricted within the \lstinline$switch$ and \lstinline$choose$ statements, precluding Duff's device.
+The \lstinline$case$ and \lstinline$default$ clauses are restricted within the \lstinline$switch$
+and \lstinline$choose$ statements, precluding Duff's device.
 
 
@@ -4122 +4147 @@
 \end{tabular}
 \end{flushleft}
-The \lstinline$choose$ statement addresses the problem of accidental fall-through associated with \lstinline$switch$ statement.
+The \lstinline$choose$ statement addresses the problem of accidental fall-through associated with
+the \lstinline$switch$ statement.
 
 
@@ -4151 +4177 @@
 \rhs \lstinline$continue$ \nonterm{identifier}\opt
 \rhs \lstinline$break$ \nonterm{identifier}\opt
+\rhs \ldots
+\rhs \lstinline$throw$ \nonterm{assignment-expression}\opt
+\rhs \lstinline$throwResume$ \nonterm{assignment-expression}\opt
 \end{syntax}
 
-Labeled \lstinline$continue$ and \lstinline$break$ allow useful but restricted control-flow that reduces the need for the \lstinline$goto$ statement for exiting multiple nested control-structures.
+Labeled \lstinline$continue$ and \lstinline$break$ allow useful but restricted control-flow that
+reduces the need for the \lstinline$goto$ statement for exiting multiple nested control-structures.
 \begin{lstlisting}
 L1: {                                                   // compound
   L2: switch ( ... ) {                  // switch
-    case ...:
+          case ...:
           L3: for ( ;; ) {                      // outer for
                 L4: for ( ;; ) {                // inner for
@@ -4192 +4222 @@
 \subsubsection{The \lstinline$return$ statement}
 
-An expression in a \lstinline$return$ statement is treated as being cast to the result type of the
-function.
+An expression in a \lstinline$return$ statement is treated as being cast to the result type of the function.
+
+
+\subsubsection{The \lstinline$throw$ statement}
+
+When an exception is raised, \Index{propagation} directs control from a raise in the source execution to a handler in the faulting execution.
+
+
+\subsubsection{The \lstinline$throwResume$ statement}
+
+
+\subsection{Exception statements}
+
+\begin{syntax}
+\lhs{exception-statement}
+\rhs \lstinline$try$ \nonterm{compound-statement} \nonterm{handler-list}
+\rhs \lstinline$try$ \nonterm{compound-statement} \nonterm{finally-clause}
+\rhs \lstinline$try$ \nonterm{compound-statement} \nonterm{handler-list} \nonterm{finally-clause}
+\lhs{handler-list}
+\rhs \nonterm{handler-clause}
+\rhs \lstinline$catch$ \lstinline$($ \ldots \lstinline$)$ \nonterm{compound-statement}
+\rhs \nonterm{handler-clause} \lstinline$catch$ \lstinline$($ \ldots \lstinline$)$ \nonterm{compound-statement}
+\rhs \lstinline$catchResume$ \lstinline$($ \ldots \lstinline$)$ \nonterm{compound-statement}
+\rhs \nonterm{handler-clause} \lstinline$catchResume$ \lstinline$($ \ldots \lstinline$)$ \nonterm{compound-statement}
+\lhs{handler-clause}
+\rhs \lstinline$catch$ \lstinline$($ \nonterm{exception-declaration} \lstinline$)$ \nonterm{compound-statement}
+\rhs \nonterm{handler-clause} \lstinline$catch$ \lstinline$($ \nonterm{exception-declaration} \lstinline$)$ \nonterm{compound-statement}
+\rhs \lstinline$catchResume$ \lstinline$($ \nonterm{exception-declaration} \lstinline$)$ \nonterm{compound-statement}
+\rhs \nonterm{handler-clause} \lstinline$catchResume$ \lstinline$($ \nonterm{exception-declaration} \lstinline$)$ \nonterm{compound-statement}
+\lhs{finally-clause}
+\rhs \lstinline$finally$ \nonterm{compound-statement}
+\lhs{exception-declaration}
+\rhs \nonterm{type-specifier}
+\rhs \nonterm{type-specifier} \nonterm{declarator}
+\rhs \nonterm{type-specifier} \nonterm{abstract-declarator}
+\rhs \nonterm{new-abstract-declarator-tuple} \nonterm{identifier}
+\rhs \nonterm{new-abstract-declarator-tuple}
+\lhs{asynchronous-statement}
+\rhs \lstinline$enable$ \nonterm{identifier-list} \nonterm{compound-statement}
+\rhs \lstinline$disable$ \nonterm{identifier-list} \nonterm{compound-statement}
+\end{syntax}
+
+\Index{Exception statement}s allow a dynamic call to a handler for \Index{recovery} (\Index{termination}) or \Index{correction} (\Index{resumption}) of an \Index{abnormal event}.
+
+
+\subsubsection{The \lstinline$try$ statement}
+
+The \lstinline$try$ statement is a block with associated handlers, called a \Index{guarded block};
+all other blocks are \Index{unguarded block}s.
+A \lstinline$goto$, \lstinline$break$, \lstinline$return$, or \lstinline$continue$ statement can be used to transfer control out of a try block or handler, but not into one.
+
+
+\subsubsection{The \lstinline$enable$/\lstinline$disable$ statements}
+
+The \lstinline$enable$/\lstinline$disable$ statements toggle when \Index{asynchronous exception}s can or cannot be delivered.