Changeset 92d8cda for libcfa/src/collections/string.cfa

Timestamp:

Sep 6, 2023, 11:49:02 AM (13 months ago)

Author:

caparsons <caparson@…>

Branches:

master

Children:

4a40fca7, 79b05224, 9d47c1f

Parents:

1f10959 (diff), 1fc111c (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

File:

• libcfa/src/collections/string.cfa (modified) (1 diff)

libcfa/src/collections/string.cfa

@@ -129 +129 @@
 
 void ?|?( ifstream & in, string & this ) {
-    (ifstream &)(in | this); ends( in );
+    in | (*this.inner);
 }
 
 ifstream & ?|?( ifstream & is, _Istream_Sstr f ) {
-        // .---------------,
-        // | | | | |...|0|0| null terminator and guard if missing
-        // `---------------'
-        enum { gwd = 128 + 1, wd = gwd - 1 };                           // guard and unguard width
-        char cstr[gwd];                                                                         // read in chunks
-        bool cont = false;
-
-        _Istream_Cstr cf = { cstr, (_Istream_str_base)f };
-        if ( ! cf.flags.rwd ) cf.wd = wd;
-
-        cstr[wd] = '\0';                                                                        // guard null terminate string
-        try {
-                is | cf;
-        } catch( cstring_length * ) {
-                cont = true;
-        } finally {
-        if ( ! cf.flags.ignore ) f.s = cstr;                    // ok to initialize string
-        } // try
-        for ( ; cont; )  {                                                                      // overflow read ?
-                cont = false;
-                try {
-                        is | cf;
-                } catch( cstring_length * ) {
-                        cont = true;                                                            // continue not allowed
-                } finally {
-                        if ( ! cf.flags.ignore ) f.s += cstr;           // build string chunk at a time
-                } // try
-        } // for
-        return is;
+        _Istream_Rstr f2 = {f.s.inner, (_Istream_str_base)f};
+    return is | f2;
 } // ?|?