Changeset 8da74119

Timestamp:

Dec 9, 2017, 12:10:04 PM (7 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:

32a1d654

Parents:

5e1adb5

Message:

additional constructors and opens

Location:

src/libcfa

Files:

• fstream (modified) (5 diffs)
• fstream.c (modified) (6 diffs)

src/libcfa/fstream

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Dec  7 08:06:11 2017
-// Update Count     : 129
+// Last Modified On : Thu Dec  7 15:17:26 2017
+// Update Count     : 130
 //
 
@@ -52 +52 @@
 int flush( ofstream & );
 void open( ofstream &, const char * name, const char * mode );
+void open( ofstream &, const char * name );
 void close( ofstream & );
 ofstream & write( ofstream &, const char * data, unsigned long int size );
@@ -58 +59 @@
 void ?{}( ofstream & os );
 void ?{}( ofstream & os, const char * name, const char * mode );
+void ?{}( ofstream & os, const char * name );
 
 extern ofstream & sout, & serr;
@@ -69 +71 @@
 int fail( ifstream & is );
 int eof( ifstream & is );
+void open( ifstream & is, const char * name, const char * mode );
 void open( ifstream & is, const char * name );
 void close( ifstream & is );
@@ -76 +79 @@
 
 void ?{}( ifstream & is );
+void ?{}( ifstream & is, const char * name, const char * mode );
 void ?{}( ifstream & is, const char * name );
 

src/libcfa/fstream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Dec  7 08:35:01 2017
-// Update Count     : 270
+// Last Modified On : Sat Dec  9 09:31:23 2017
+// Update Count     : 275
 //
 
@@ -46 +46 @@
 
 // public
-void ?{}( ofstream & os ) {}
+void ?{}( ofstream & os ) { os.file = 0; }
 
 void ?{}( ofstream & os, const char * name, const char * mode ) {
         open( os, name, mode );
+}
+void ?{}( ofstream & os, const char * name ) {
+        open( os, name, "w" );
 }
 
@@ -84 +87 @@
 
 int fail( ofstream & os ) {
-        return ferror( (FILE *)(os.file) );
+        return os.file == 0 || ferror( (FILE *)(os.file) );
 } // fail
 
@@ -93 +96 @@
 void open( ofstream & os, const char * name, const char * mode ) {
         FILE *file = fopen( name, mode );
-        if ( file == 0 ) {                                                                      // do not change unless successful
-                fprintf( stderr, IO_MSG "open output file \"%s\", ", name );
-                perror( 0 );
-                exit( EXIT_FAILURE );
-        } // if
+        // if ( file == 0 ) {                                                                   // do not change unless successful
+        //      fprintf( stderr, IO_MSG "open output file \"%s\", ", name );
+        //      perror( 0 );
+        //      exit( EXIT_FAILURE );
+        // } // if
         (os){ file, true, false, " ", ", " };
+} // open
+
+void open( ofstream & os, const char * name ) {
+        open( os, name, "w" );
 } // open
 
@@ -152 +159 @@
 
 // public
-void ?{}( ifstream & is ) {}
-
+void ?{}( ifstream & is ) {     is.file = 0; }
+
+void ?{}( ifstream & is, const char * name, const char * mode ) {
+        open( is, name, mode );
+}
 void ?{}( ifstream & is, const char * name ) {
-        open( is, name );
+        open( is, name, "r" );
 }
 
 int fail( ifstream & is ) {
-        return ferror( (FILE *)(is.file) );
+        return is.file == 0 || ferror( (FILE *)(is.file) );
 } // fail
 
@@ -166 +176 @@
 } // eof
 
+void open( ifstream & is, const char * name, const char * mode ) {
+        FILE *file = fopen( name, mode );
+        // if ( file == 0 ) {                                                                   // do not change unless successful
+        //      fprintf( stderr, IO_MSG "open input file \"%s\", ", name );
+        //      perror( 0 );
+        //      exit( EXIT_FAILURE );
+        // } // if
+        is.file = file;
+} // open
+
 void open( ifstream & is, const char * name ) {
-        FILE *file = fopen( name, "r" );
-        if ( file == 0 ) {                                                                      // do not change unless successful
-                fprintf( stderr, IO_MSG "open input file \"%s\", ", name );
-                perror( 0 );
-                exit( EXIT_FAILURE );
-        } // if
-        is.file = file;
+        open( is, name, "r" );
 } // open