Changeset 3d9b5da

Timestamp:

Apr 7, 2016, 5:35:36 PM (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:

224e52f, 630a82a

Parents:

53ba273

Message:

fix library includes from < to ", and generalize rational IO to use iostream from fstream

Location:

src

Files:

• examples/rational.c (modified) (1 diff)
• libcfa/limits.c (modified) (1 diff)
• libcfa/rational (modified) (2 diffs)
• libcfa/rational.c (modified) (3 diffs)

src/examples/rational.c

@@ -11 +11 @@
 // Created On       : Mon Mar 28 08:43:12 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Apr  6 18:02:02 2016
-// Update Count     : 19
+// Last Modified On : Thu Apr  7 17:25:44 2016
+// Update Count     : 20
 // 
 
 #include <limits>
 #include <rational>
+#include <fstream>
 
 int main() {

src/libcfa/limits.c

@@ -10 +10 @@
 // Created On       : Wed Apr  6 18:06:52 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Apr  6 21:12:17 2016
-// Update Count     : 10
+// Last Modified On : Thu Apr  7 17:18:45 2016
+// Update Count     : 11
 // 
 
-#include <limits>
+#include "limits"
 
 // Integral Constants

src/libcfa/rational

@@ -10 +10 @@
 // Created On       : Wed Apr  6 17:56:25 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Apr  6 21:51:42 2016
-// Update Count     : 8
+// Last Modified On : Thu Apr  7 17:23:36 2016
+// Update Count     : 9
 // 
 
-#include <fstream>
+#include "iostream"
 
 struct Rational {
@@ -44 +44 @@
 double widen( Rational r );
 Rational narrow( double f, long int md );
-ifstream * ?|?( ifstream *is, Rational *r );
-ofstream * ?|?( ofstream *os, Rational r );
+forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, Rational * );
+forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, Rational );
 
 // Local Variables: //

src/libcfa/rational.c

@@ -11 +11 @@
 // Created On       : Wed Apr  6 17:54:28 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Apr  6 21:52:16 2016
-// Update Count     : 7
+// Last Modified On : Thu Apr  7 17:28:03 2016
+// Update Count     : 12
 // 
 
 #include "rational"
-#include <fstream>
-#include <stdlib>
+#include "fstream"
+#include "stdlib"
 
 extern "C" {
@@ -188 +188 @@
 } // narrow
 
-ifstream * ?|?( ifstream *is, Rational *r ) {
+forall( dtype istype | istream( istype ) )
+istype * ?|?( istype *is, Rational *r ) {
         long int t;
     is | &(r->numerator) | &(r->denominator);
@@ -197 +198 @@
 } // ?|?
 
-ofstream * ?|?( ofstream *os, Rational r ) {
+forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype *os, Rational r ) {
     return os | r.numerator | '/' | r.denominator;
 } // ?|?