Changes in / [8ee15ffd:d0d9610]

Location:

doc/refrat

Files:

• Makefile (modified) (3 diffs)
• refrat.tex (modified) (18 diffs)
• xref.tex (added)

doc/refrat/Makefile

@@ -7 +7 @@
 ## Define the text source files.
 
-SOURCES = ${addsuffix .tex, \
+SOURCE = ${addsuffix .tex, \
 refrat \
 }
@@ -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 #
@@ -43 +42 @@
         dvips $< -o $@
 
-${basename ${DOCUMENT}}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex ${basename ${DOCUMENT}}.bib
-        # Conditionally create an empty *.ind (index) file for inclusion until makeindex is run.
+${basename ${DOCUMENT}}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCE} ${basename ${DOCUMENT}}.bbl
+        ${LaTeX} ${basename $@}.tex
+        if fgrep -s "Label(s) may have changed" ${basename $@}.log ; then ${LaTeX} ${basename $@}.tex ; fi
+        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
-        # 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
         -${BibTeX} ${basename $@}
-        # Make index from *.aux entries and input index at end of document
-        makeindex -s indexstyle ${basename $@}.idx
-        ${LaTeX} ${basename $@}.tex
-        # Run again to get index title into table of contents
-        ${LaTeX} ${basename $@}.tex
 
 ## 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}
@@ -18 +14 @@
 \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.
-
-\newcommand{\italic}[1]{\emph{\hyperpage{#1}}}
-\newcommand{\definition}[1]{\textbf{\hyperpage{#1}}}
-\newcommand{\see}[1]{\emph{see} #1}
-
-\makeatletter
-% Define some commands that produce formatted index entries suitable for cross-references.
-% ``\spec'' produces entries for specifications of entities.  ``\impl'' produces entries for their
-% implementations, and ``\use'' for their uses.
-
-%  \newcommand{\bold}[1]{{\bf #1}}
-%  \def\spec{\@bsphack\begingroup
-%             \def\protect##1{\string##1\space}\@sanitize
-%             \@wrxref{|bold}}
-\def\impl{\@bsphack\begingroup
-          \def\protect##1{\string##1\space}\@sanitize
-          \@wrxref{|definition}}
-\newcommand{\indexcode}[1]{{\lstinline$#1$}}
-\def\use{\@bsphack\begingroup
-         \def\protect##1{\string##1\space}\@sanitize
-         \@wrxref{|hyperpage}}
-\def\@wrxref#1#2{\let\thepage\relax
-    \xdef\@gtempa{\write\@indexfile{\string
-    \indexentry{#2@{\lstinline$#2$}#1}{\thepage}}}\endgroup\@gtempa
-    \if@nobreak \ifvmode\nobreak\fi\fi\@esphack}
-\makeatother
-%\newcommand{\use}[1]{\index{#1@{\lstinline$#1$}}}
-%\newcommand{\impl}[1]{\index{\protect#1@{\lstinline$\protect#1$}|definition}}
+%\input code.sty
+\input xref.tex
 
 \newcommand{\define}[1]{\emph{#1\/}\index{#1}}
@@ -79 +37 @@
 \def\syntax{\paragraph{Syntax}\trivlist\parindent=.5in\item[\hskip.5in]}
 \let\endsyntax=\endtrivlist
-\newcommand{\lhs}[1]{\par{\emph{#1:}}\index{#1@{\emph{#1}}|italic}}
+\newcommand{\lhs}[1]{\par{\it #1:}\index{#1@{\it #1}|italic}}
 \newcommand{\rhs}{\hfil\break\hbox{\hskip1in}}
-\newcommand{\oldlhs}[1]{\emph{#1: \ldots}\index{#1@{\emph{#1}}|italic}}
-\newcommand{\nonterm}[1]{\emph{#1\/}\index{#1@{\emph{#1}}|italic}}
+\newcommand{\oldlhs}[1]{{\it #1: \ldots}\index{#1@{\it #1}|italic}}
+\newcommand{\nonterm}[1]{{\it #1\/}\index{#1@{\it #1}|italic}}
 \newcommand{\opt}{$_{opt}$\ }
 
@@ -94 +52 @@
 \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
@@ -100 +63 @@
 \lst@ProcessOther{"3C}{\lst@ttfamily{<}{\texttt{<}}} % replace less than
 \lst@ProcessOther{"3E}{\lst@ttfamily{<}{\texttt{>}}} % replace greater than
-\lst@ProcessOther{"5E}{\raisebox{0.4ex}{$\scriptstyle\land\,$}} % circumflex
+\lst@ProcessOther{"5E}{$\sim$} % 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{0.3ex}{$\scriptstyle\sim\,$}} % lower tilde
+\lst@ProcessOther{"7E}{\raisebox{-.4ex}[1ex][0pt]{\textasciitilde}} % lower tilde
 \@empty\z@\@empty
 
@@ -112 +74 @@
 
 \lstdefinelanguage{CFA}[ANSI]{C}%
-  {morekeywords={asm,_Atomic,catch,catchResume,choose,_Complex,context,disable,dtype,enable,
-        fallthru,finally,forall,ftype,_Imaginary,lvalue,restrict,throw,throwResume,try,type,},
+  {morekeywords={asm,_Atomic,catch,choose,_Complex,context,dtype,fallthru,forall,ftype,_Imaginary,lvalue,restrict,throw,try,type,},
 }
 
@@ -123 +84 @@
 xleftmargin=\parindent,
 escapechar=@,
-%fancyvrb=true,
 %showtabs=true,
-keepspaces=true,
-showtabs=true,
-tab=,
+%tab=\rightarrowfill,
 }
 
@@ -133 +91 @@
 \setcounter{tocdepth}{3}                % subsubsections in table of contents
 \makeindex
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \begin{document}
@@ -735 +691 @@
 
 \examples
-The expression \lstinline$(void *)0$\use{0} specializes the (polymorphic) null pointer to a null
+The expression \lstinline$(void *)0}$\use{0} specializes the (polymorphic) null pointer to a null
 pointer to \lstinline$void$. \lstinline$(const void *)0$ does the same, and also uses a safe
 conversion from \lstinline$void *$ to \lstinline$const void *$. In each case, the null pointer
@@ -2469 +2425 @@
 
 The operands of the expression ``\lstinline$a || b$'' are treated as ``\lstinline$(int)((a)!=0)$''
-and ``\lstinline$(int)((b))!=0)$'', which shall both be unambiguous. The expression has only one
+and ``\lstinline$(int)((b})!=0)$'', which shall both be unambiguous. The expression has only one
 interpretation, which is of type \lstinline$int$.
 
@@ -4080 +4036 @@
 \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
@@ -4107 +4058 @@
 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:
 \end{lstlisting}
-Multiple subranges are allowed:
+The multiple subranges are allowed:
 \begin{lstlisting}
 case 1~4, 9~14, 27~32:
 \end{lstlisting}
+
 The \lstinline$case$ and \lstinline$default$ clauses are restricted within the \lstinline$switch$ and \lstinline$choose$ statements, precluding Duff's device.
 
@@ -4135 +4087 @@
 choose ( E ) ...
 \end{lstlisting}
-may have more than one interpretation, but it shall have only one interpretation with an integral type.
-An \Index{integer promotion} is performed on the expression if necessary.
-The constant expressions in \lstinline$case$ statements with the switch are converted to the promoted type.
+may have more than one interpretation, but it shall have only one interpretation with an integral
+type. An \Index{integer promotion} is performed on the expression if necessary.  The constant
+expressions in \lstinline$case$ statements with the switch are converted to the promoted type.
 
 
@@ -4145 +4097 @@
 The \lstinline$choose$ statement is the same as the \lstinline$switch$ statement except control transfers to the end of the \lstinline$choose$ statement at a \lstinline$case$ or \lstinline$default$ labeled statement.
 The \lstinline$fallthru$ statement is used to fall through to the next \lstinline$case$ or \lstinline$default$ labeled statement.
+
 The following have identical meaning:
 \begin{flushleft}
@@ -4169 +4122 @@
 \end{tabular}
 \end{flushleft}
-The \lstinline$choose$ statement addresses the problem of accidental fall-through associated with the \lstinline$switch$ statement.
+The \lstinline$choose$ statement addresses the problem of accidental fall-through associated with \lstinline$switch$ statement.
 
 
@@ -4198 +4151 @@
 \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 \nonterm{at-expression}\opt
-\lhs{at-expression} \lstinline$_At$ \nonterm{assignment-expression}
 \end{syntax}
 
@@ -4208 +4157 @@
 L1: {                                                   // compound
   L2: switch ( ... ) {                  // switch
-          case ...:
+    case ...:
           L3: for ( ;; ) {                      // outer for
                 L4: for ( ;; ) {                // inner for
@@ -4243 +4192 @@
 \subsubsection{The \lstinline$return$ statement}
 
-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 delivery of \Index{asynchronous exception}s.
+An expression in a \lstinline$return$ statement is treated as being cast to the result type of the
+function.