Changeset ef346f7c

Timestamp:

Dec 26, 2018, 7:19:48 AM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

f498c51

Parents:

9d362a0

git-author:

Peter A. Buhr <pabuhr@…> (12/25/18 17:53:59)

git-committer:

Peter A. Buhr <pabuhr@…> (12/26/18 07:19:48)

Message:

fix ostype

Files:

• libcfa/src/rational.cfa (modified) (2 diffs)
• libcfa/src/time.cfa (modified) (5 diffs)
• tests/loopctrl.cfa (modified) (2 diffs)
• tests/sum.cfa (modified) (2 diffs)
• tests/swap.cfa (modified) (2 diffs)

libcfa/src/rational.cfa

@@ -10 +10 @@
 // Created On       : Wed Apr  6 17:54:28 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec 11 22:02:29 2018
-// Update Count     : 168
+// Last Modified On : Sun Dec 23 22:56:49 2018
+// Update Count     : 170
 //
 
@@ -181 +181 @@
 
                 void ?|?( ostype & os, Rational(RationalImpl) r ) {
-                        (ostype)(os | r); if ( getANL( os ) ) nl( os );
+                        (ostype &)(os | r); nl( os );
                 } // ?|?
         } // distribution

libcfa/src/time.cfa

@@ -10 +10 @@
 // Created On       : Tue Mar 27 13:33:14 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec 11 21:32:15 2018
-// Update Count     : 53
+// Last Modified On : Sun Dec 23 22:57:48 2018
+// Update Count     : 57
 //
 
@@ -33 +33 @@
 forall( dtype ostype | ostream( ostype ) ) {
         ostype & ?|?( ostype & os, Duration dur ) with( dur ) {
-                (ostype)(os | tv / TIMEGRAN);                                   // print seconds
+                (ostype &)(os | tv / TIMEGRAN);                                 // print seconds
                 long int ns = (tv < 0 ? -tv : tv) % TIMEGRAN;   // compute nanoseconds
                 if ( ns != 0 ) {                                                                // some ?
                         char buf[16];
-                        (ostype)(os | nanomsd( ns, buf ));                      // print nanoseconds
+                        (ostype &)(os | nanomsd( ns, buf ));                    // print nanoseconds
                 } // if
                 return os;
@@ -43 +43 @@
 
         void ?|?( ostype & os, Duration dur ) with( dur ) {
-                (ostype)(os | dur); if ( getANL( os ) ) nl( os );
+                (ostype &)(os | dur); nl( os );
         } // ?|?
 } // distribution
@@ -150 +150 @@
                 long int ns = (tv < 0 ? -tv : tv) % TIMEGRAN;   // compute nanoseconds
                 if ( ns == 0 ) {                                                                // none ?
-                        (ostype)(os | buf);                                                     // print date/time/year
+                        (ostype &)(os | buf);                                                   // print date/time/year
                 } else {
                         buf[19] = '\0';                                                         // truncate to "Wed Jun 30 21:49:08"
                         char buf2[16];
                         nanomsd( ns, buf2 );                                            // compute nanoseconds
-                        (ostype)(os | buf | buf2 | ' ' | &buf[20]);     // print date/time, nanoseconds and year
+                        (ostype &)(os | buf | buf2 | ' ' | &buf[20]);   // print date/time, nanoseconds and year
                 } // if
                 return os;
@@ -161 +161 @@
 
         void ?|?( ostype & os, Time time ) with( time ) {
-                (ostype)(os | time); if ( getANL( os ) ) nl( os );
+                (ostype &)(os | time); nl( os );
         } // ?|?
 } // distribution

tests/loopctrl.cfa

@@ -10 +10 @@
 // Created On       : Wed Aug  8 18:32:59 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Dec 22 09:41:15 2018
-// Update Count     : 77
+// Last Modified On : Sun Dec 23 23:00:29 2018
+// Update Count     : 79
 // 
 
@@ -32 +32 @@
 S ?-=?( S & t, one_t ) { t.i -= 1; t.j -= 1; return t; }
 ofstream & ?|?( ofstream & os, S v ) { return os | '(' | v.i | v.j | ')'; }
-void & ?|?( ofstream & os, S v ) { (ofstream)(os | v); if ( getANL( os ) ) nl( os ); }
+void & ?|?( ofstream & os, S v ) { (ofstream &)(os | v); nl( os ); }
 
 int main() {

tests/sum.cfa

@@ -11 +11 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec 11 21:50:41 2018
-// Update Count     : 285
+// Last Modified On : Sun Dec 23 23:00:38 2018
+// Update Count     : 287
 //
 
@@ -93 +93 @@
         S ?++( S & t ) { S temp = t; t += (S){1}; return temp; }
         ofstream & ?|?( ofstream & os, S v ) { return os | v.i | v.j; }
-        void ?|?( ofstream & os, S v ) { (ofstream)(os | v); if ( getANL( os ) ) nl( os ); }
+        void ?|?( ofstream & os, S v ) { (ofstream &)(os | v); nl( os ); }
 
         S s = (S){0}, a[size], v = { low, low };

tests/swap.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Dec 22 16:01:33 2018
-// Update Count     : 75
+// Last Modified On : Sun Dec 23 23:00:49 2018
+// Update Count     : 77
 //
 
@@ -85 +85 @@
         struct S { int i, j; } s1 = { 1, 2 }, s2 = { 2, 1 };
         ofstream & ?|?( ofstream & os, S s ) { return os | s.i | s.j; }
-        void ?|?( ofstream & os, S s ) { (ofstream)(os | s.i | s.j); if ( getANL( os ) ) nl( os ); }
+        void ?|?( ofstream & os, S s ) { (ofstream &)(os | s.i | s.j); nl( os ); }
         sout | "struct S\t\t" | s1 | "," | s2 | "\t\tswap " | nonl;
         swap( s1, s2 );