Changeset 0583064b

Timestamp:

Mar 23, 2017, 10:39:30 AM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

6013bd7, 7895d46

Parents:

89e1b16

Message:

additions to printing tuples, iostream, nad user documentations

Files:

• doc/user/user.tex (modified) (8 diffs)
• src/libcfa/fstream.c (modified) (4 diffs)
• src/libcfa/iostream.c (modified) (3 diffs)

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

src/libcfa/fstream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar 22 16:17:21 2017
-// Update Count     : 221
+// Last Modified On : Thu Mar 23 08:20:41 2017
+// Update Count     : 226
 //
 
@@ -29 +29 @@
 #define IO_MSG "I/O error: "
 
+void ?{}( ofstream * this, void * file, _Bool sepDefault, _Bool sepOnOff, const char * separator, const char * tupleSeparator ) {
+        this->file = file;
+        this->sepDefault = sepDefault;
+        this->sepOnOff = sepOnOff;
+        sepSet( this, separator );
+        sepSetCur( this, sepGet( this ) );
+        sepSetTuple( this, tupleSeparator );
+}
+
 _Bool sepPrt( ofstream * os ) { return os->sepOnOff; }
 void sepOn( ofstream * os ) { os->sepOnOff = 1; }
@@ -83 +92 @@
                 exit( EXIT_FAILURE );
         } // if
-        os->file = file;
-        sepOff( os );
-        sepSet( os, " " );
+        ?{}( os, file, 1, 0, " ", ", " );
 } // open
 
@@ -125 +132 @@
 } // fmt
 
-void ?{}( ofstream * this, void * file, _Bool sepDefault, _Bool sepOnOff, const char * separator, const char * tupleSeparator ) {
-        this->file = file;
-        this->sepDefault = sepDefault;
-        this->sepOnOff = sepOnOff;
-        sepSet( this, separator );
-        sepSetCur( this, sepGet( this ) );
-        sepSetTuple( this, tupleSeparator );
-}
-
 static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_), 1, 0, " ", ", " };
 ofstream *sout = &soutFile;

src/libcfa/iostream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar 22 17:46:06 2017
-// Update Count     : 359
+// Last Modified On : Thu Mar 23 08:20:40 2017
+// Update Count     : 367
 //
 
@@ -201 +201 @@
 forall( dtype ostype, otype T, ttype Params | ostream( ostype ) | writeable( T ) | { ostype * ?|?( ostype *, Params ); } )
 ostype * ?|?( ostype * os, T arg, Params rest ) {
-        forall( ttype Params ) ostype * prtTuple( T arg, Params rest ) {
-                os | arg;                                                                               // print first argument
-                os | rest;                                                                              // print remaining arguments
-                return os;
-        } // prtTuple
         sepSetCur( os, sepGetTuple( os ) );                                     // switch to tuple separator
-        prtTuple( arg, rest );                                                          // recursively print tuple
+        os | arg;                                                                                       // print first argument
+        os | rest;                                                                                      // print remaining arguments
         sepSetCur( os, sepGet( os ) );                                          // switch to regular separator
         return os;
@@ -223 +219 @@
         os | '\n';
         flush( os );
-        sepOff( os );
+        sepOff( os );                                                                           // prepare for next line
         return os;
 } // endl