Changeset c58f4ab for doc

Timestamp:

Mar 23, 2017, 11:30:42 AM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, resolv-new, with_gc

Children:

578b637

Parents:

9fcdfa3 (diff), 27cc24e (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

doc

Files:

• generic_types/generic_types.tex (modified) (2 diffs)
• rob_thesis/Makefile (added)
• user/user.tex (modified) (8 diffs)

doc/generic_types/generic_types.tex

@@ -139 +139 @@
 \begin{lstlisting}
 forall(otype T)
-T identity(T x) {is_
+T identity(T x) {
     return x;
 }
@@ -294 +294 @@
 Since @pair(T*, T*)@ is a concrete type, there are no added implicit parameters to @lexcmp@, so the code generated by \CFA{} will be effectively identical to a version of this written in standard C using @void*@, yet the \CFA{} version will be type-checked to ensure that the fields of both pairs and the arguments to the comparison function match in type.
 
-\TODO{} The second is zero-cost ``tag'' structs.
+Another useful pattern enabled by re-used dtype-static type instantiations is zero-cost ``tag'' structs. Sometimes a particular bit of information is only useful for type-checking, and can be omitted at runtime. Tag structs can be used to provide this information to the compiler without further runtime overhead, as in the following example:
+\begin{lstlisting}
+forall(dtype Unit) struct scalar { unsigned long value; };
+
+struct metres {};
+struct litres {};
+
+forall(dtype U)
+scalar(U) ?+?(scalar(U) a, scalar(U) b) {
+        return (scalar(U)){ a.value + b.value };
+}
+
+scalar(metres) half_marathon = { 21093 };
+scalar(litres) swimming_pool = { 2500000 };
+
+scalar(metres) marathon = half_marathon + half_marathon;
+scalar(litres) two_pools = swimming_pool + swimming_pool;
+marathon + swimming_pool; // ERRORv -- caught by compiler
+\end{lstlisting}
+@scalar@ is a dtype-static type, so all uses of it will use a single struct definition, containing only a single @unsigned long@, and can share the same implementations of common routines like @?+?@ -- these implementations may even be separately compiled, unlike \CC{} template functions. However, the \CFA{} type-checker will ensure that matching types are used by all calls to @?+?@, preventing nonsensical computations like adding the length of a marathon to the volume of an olympic pool.
 
 \section{Tuples}

doc/user/user.tex

@@ -11 +11 @@
 %% Created On       : Wed Apr  6 14:53:29 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Mon Feb 20 12:35:48 2017
-%% Update Count     : 1377
+%% Last Modified On : Thu Mar 23 09:53:57 2017
+%% Update Count     : 1399
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -91 +91 @@
 }% title
 
-\author{\huge
-Peter A. Buhr and ...
+\author{
+\huge \CFA Team \medskip \\
+\Large Peter A. Buhr, Richard Bilson, Thierry Delisle, \smallskip \\
+\Large Glen Ditchfield, Rodolfo G. Esteves, Aaron Moss, Rob Schluntz
 }% author
 
@@ -4657 +4659 @@
 which is a local mechanism to disable insertion of the separator character.
 \item
-A separator does not appear before a C string starting with the (extended) \Index{ASCII}\index{ASCII!extended} characters: \lstinline[mathescape=off]@([{$£¥¡¿«@
+A separator does not appear before a C string starting with the (extended) \Index{ASCII}\index{ASCII!extended} characters: \lstinline[mathescape=off]@([{=$£¥¡¿«@
 %$
 \begin{lstlisting}[mathescape=off]
-sout | "x (" | 1 | "x [" | 2 | "x {" | 3 | "x $" | 4 | "x £" | 5 | "x ¥" | 6 | "x ¡" | 7
-         | "x ¿" | 8 | "x «" | 9 | endl;
+sout | "x (" | 1 | "x [" | 2 | "x {" | 3 | "x =" | 4 | "x $" | 5 | "x £" | 6 | "x ¥" | 7
+         | "x ¡" | 8 | "x ¿" | 9 | "x «" | 10 | endl;
 \end{lstlisting}
 %$
 \begin{lstlisting}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
-x (1 x [2 x {3 x $4 x £5 x ¥6 x ¡7 x ¿8 x «9
+x (1 x [2 x {3 x =4 x $5 x £6 x ¥7 x ¡8 x ¿9 x «10
 \end{lstlisting}
 %$
 \item
+{\lstset{deletedelim=**[is][]{¢}{¢}}
 A seperator does not appear after a C string ending with the (extended) \Index{ASCII}\index{ASCII!extended} characters: ©,.:;!?)]}%¢»©
 \begin{lstlisting}[belowskip=0pt]
-sout | 1 | ", x" | 2 | ". x" | 3 | ": x" | 4 | "; x" | 5 | "! x" | 6 | "? x" | 7
-         | ") x" | 8 | "] x" | 9 | "} x" | 10 | "% x" | 11 | "¢ x" | 12 | "» x" | endl;
+sout | 1 | ", x" | 2 | ". x" | 3 | ": x" | 4 | "; x" | 5 | "! x" | 6 | "? x" | 7 | "% x"
+         | 8 | "¢ x" | 9 | "» x" | 10 | ") x" | 11 | "] x" | 12 | "} x" | endl;
 \end{lstlisting}
 \begin{lstlisting}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
-1, x 2. x 3: x 4; x 5! x 6? x 7) x 8] x 9} x 10% x 11¢ 12»
-\end{lstlisting}
+1, x 2. x 3: x 4; x 5! x 6? x 7% x 8¢ x 9» x 10) x 11] x 12} x
+\end{lstlisting}}%
 \item
 A seperator does not appear before or after a C string begining/ending with the \Index{ASCII} quote or whitespace characters: \lstinline[showspaces=true]@`'" \t\v\f\r\n@
@@ -4694 +4697 @@
 \end{lstlisting}
 \begin{lstlisting}[mathescape=off,aboveskip=0pt,belowskip=0pt]
-sout | 1 | sepOff | 2 | 3 | endl;                       §\C{// turn off implicit separator temporarily}§
+sout | 1 | sepOff | 2 | 3 | endl;                       §\C{// turn off implicit separator locally}§
 \end{lstlisting}
 \begin{lstlisting}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
@@ -4700 +4703 @@
 \end{lstlisting}
 \begin{lstlisting}[mathescape=off,aboveskip=0pt,belowskip=0pt]
-sout | sepDisable | 1 | 2 | 3 | endl;           §\C{// turn off implicit separation, affects all subsequent prints}§
+sout | sepDisable | 1 | 2 | 3 | endl;           §\C{// turn off implicit separation globally}§
 \end{lstlisting}
 \begin{lstlisting}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
@@ -4706 +4709 @@
 \end{lstlisting}
 \begin{lstlisting}[mathescape=off,aboveskip=0pt,belowskip=0pt]
-sout | 1 | sepOn | 2 | 3 | endl;                        §\C{// turn on implicit separator temporarily}§
+sout | 1 | sepOn | 2 | 3 | endl;                        §\C{// turn on implicit separator locally}§
 \end{lstlisting}
 \begin{lstlisting}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
@@ -4712 +4715 @@
 \end{lstlisting}
 \begin{lstlisting}[mathescape=off,aboveskip=0pt,belowskip=0pt]
-sout | sepEnable | 1 | 2 | 3 | endl;            §\C{// turn on implicit separation, affects all subsequent prints}§
+sout | sepEnable | 1 | 2 | 3 | endl;            §\C{// turn on implicit separation globally}§
 \end{lstlisting}
 \begin{lstlisting}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
@@ -4730 +4733 @@
 
 int main() {
-        int x = 3, y = 5, z = 7;
-        sout | x * 3 | y + 1 | z << 2 | x == y | (x | y) | (x || y) | (x > z ? 1 : 2) | endl;
+        int x = 0, y = 1, z = 2;
+        sout | x * 3 | y + 1 | z << 2 | x == y | (x | y) | (x || y) | (x > z ? 1 : 2) | endl | endl;
         sout | 1 | 2 | 3 | endl;
         sout | '1' | '2' | '3' | endl;
         sout | 1 | "" | 2 | "" | 3 | endl;
-        sout | "x (" | 1 | "x [" | 2 | "x {" | 3 | "x $" | 4 | "x £" | 5 | "x ¥" | 6 | "x ¡" | 7 | "x ¿" | 8 | "x «" | 9 | endl;
-        sout | 1 | ", x" | 2 | ". x" | 3 | ": x" | 4 | "; x" | 5 | "! x" | 6 | "? x" | 7 | ") x" | 8 | "] x" | 9 | "} x"
-                 | 10 | "% x" | 11 | "¢ x" | 12 | "» x" | endl;
+        sout | "x (" | 1 | "x [" | 2 | "x {" | 3 | "x =" | 4 | "x $" | 5 | "x £" | 6 | "x ¥" | 7
+                | "x ¡" | 8 | "x ¿" | 9 | "x «" | 10 | endl;
+        sout | 1 | ", x" | 2 | ". x" | 3 | ": x" | 4 | "; x" | 5 | "! x" | 6 | "? x" | 7 | "% x"
+                | 8 | "¢ x" | 9 | "» x" | 10 | ") x" | 11 | "] x" | 12 | "} x" | endl;
         sout | "x`" | 1 | "`x'" | 2 | "'x\"" | 3 | "\"x" | "x " | 4 | " x" | "x\t" | 1 | "\tx" | endl;
         sout | sepOn | 1 | 2 | 3 | sepOn | endl;        // separator at start of line