Changeset 463cb33 for libcfa/src

Timestamp:

Jul 16, 2020, 2:59:56 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

c82af9f

Parents:

519f11c (diff), 3f06c05 (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

Location:

libcfa/src

Files:

• iostream.cfa (modified) (2 diffs)
• iostream.hfa (modified) (2 diffs)

libcfa/src/iostream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jul  8 22:14:20 2020
-// Update Count     : 1069
+// Last Modified On : Thu Jul 16 07:43:31 2020
+// Update Count     : 1102
 //
 
@@ -970 +970 @@
         } // ?|?
 
+#if defined( __SIZEOF_INT128__ )
+        istype & ?|?( istype & is, int128 & i128 ) {
+                return (istype &)(is | (unsigned int128 &)i128);
+        } // ?|?
+
+        istype & ?|?( istype & is, unsigned int128 & ui128 ) {
+                char s[40];
+                bool sign = false;
+
+                if ( fmt( is, " %[-]", s ) == 1 ) sign = true;  // skip whitespace, negative sign ?
+                // If the input is too large, the value returned is undefined. If there is no input, no value is returned
+                if ( fmt( is, "%39[0-9]%*[0-9]", s ) == 1 ) {   // take first 39 characters, ignore remaining
+                        ui128 = 0;
+                        for ( unsigned int i = 0; s[i] != '\0'; i += 1 ) {
+                                ui128 = ui128 * 10 + s[i] - '0';
+                        } // for
+                        if ( sign ) ui128 = -ui128;
+                } else if ( sign ) ungetc( is, '-' );                   // return minus when no digits
+                return is;
+        } // ?|?
+#endif // __SIZEOF_INT128__
 
         istype & ?|?( istype & is, float & f ) {

libcfa/src/iostream.hfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul 13 22:11:41 2020
-// Update Count     : 344
+// Last Modified On : Thu Jul 16 07:43:32 2020
+// Update Count     : 348
 //
 
@@ -315 +315 @@
         istype & ?|?( istype &, unsigned int & );
         istype & ?|?( istype &, long int & );
+        istype & ?|?( istype &, unsigned long int & );
         istype & ?|?( istype &, long long int & );
-        istype & ?|?( istype &, unsigned long int & );
         istype & ?|?( istype &, unsigned long long int & );
+#if defined( __SIZEOF_INT128__ )
+        istype & ?|?( istype &, int128 & );
+        istype & ?|?( istype &, unsigned int128 & );
+#endif // __SIZEOF_INT128__
 
         istype & ?|?( istype &, float & );