Changeset 6abb6dc for libcfa

Timestamp:

Aug 10, 2024, 10:27:26 AM (18 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master, stuck-waitfor-destruct

Children:

774c97e

Parents:

2ca7fc2 (diff), 5ca5263 (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:

• collections/string.hfa (modified) (3 diffs)
• enum.cfa (modified) (3 diffs)
• enum.hfa (modified) (1 diff)
• heap.cfa (modified) (2 diffs)

libcfa/src/collections/string.hfa

@@ -10 +10 @@
 // Created On       : Fri Sep 03 11:00:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Aug  5 23:06:14 2024
-// Update Count     : 128
+// Last Modified On : Tue Aug  6 07:49:52 2024
+// Update Count     : 130
 //
 
@@ -161 +161 @@
 string ?+?( char c, const string & s );                                 // add a character to a copy of the string
 string ?+?( const string & s, const string & s2 );              // copy and concatenate both strings
-string ?+?( const char * s, char c );                                   // copy and concatenate both strings
-string ?+?( char c, const char * s );                                   // copy and concatenate both strings
-string ?+?( const char * s1, const char * s2 );                 // copy and concatenate both strings
-string ?+?( const char * s1, string & s2 );                             // copy and concatenate both strings
-string ?+?( const string & s, const char * c );                 // copy and concatenate with NULL-terminated string
+string ?+?( const char * s, char c );                                   // add a character to a copy of the string
+string ?+?( char c, const char * s );                                   // add a character to a copy of the string
+string ?+?( const char * c, const char * s );                   // copy and add with two NULL-terminated string
+string ?+?( const char * c, string & s );                               // copy and add with NULL-terminated string
+string ?+?( const string & s, const char * c );                 // copy and add with NULL-terminated string
 
 static inline string & strcat( string & s, const string & s2 ) { s += s2; return s; }
@@ -184 +184 @@
 
 // Comparisons
-int strcmp ( const string &, const string &);
-bool ?==?( const string &, const string &);
-bool ?!=?( const string &, const string &);
-bool ?>? ( const string &, const string &);
-bool ?>=?( const string &, const string &);
-bool ?<=?( const string &, const string &);
-bool ?<? ( const string &, const string &);
-
-int strcmp( const string &, const char *);
-bool ?==?( const string &, const char *);
-bool ?!=?( const string &, const char *);
-bool ?>? ( const string &, const char *);
-bool ?>=?( const string &, const char *);
-bool ?<=?( const string &, const char *);
-bool ?<? ( const string &, const char *);
-
-int strcmp( const char *, const string &);
-bool ?==?( const char *, const string &);
-bool ?!=?( const char *, const string &);
-bool ?>? ( const char *, const string &);
-bool ?>=?( const char *, const string &);
-bool ?<=?( const char *, const string &);
-bool ?<? ( const char *, const string &);
+int strcmp ( const string &, const string & );
+bool ?==?( const string &, const string & );
+bool ?!=?( const string &, const string & );
+bool ?>? ( const string &, const string & );
+bool ?>=?( const string &, const string & );
+bool ?<=?( const string &, const string & );
+bool ?<? ( const string &, const string & );
+
+int strcmp( const string &, const char * );
+bool ?==?( const string &, const char * );
+bool ?!=?( const string &, const char * );
+bool ?>? ( const string &, const char * );
+bool ?>=?( const string &, const char * );
+bool ?<=?( const string &, const char * );
+bool ?<? ( const string &, const char * );
+
+int strcmp( const char *, const string & );
+bool ?==?( const char *, const string & );
+bool ?!=?( const char *, const string & );
+bool ?>? ( const char *, const string & );
+bool ?>=?( const char *, const string & );
+bool ?<=?( const char *, const string & );
+bool ?<? ( const char *, const string & );
 
 

libcfa/src/enum.cfa

@@ -11 +11 @@
                 // It is okay to overflow as overflow will be theoretically caught by the other bound
                 if ( i < fromInstance( lower ) || i > fromInstance( upper ) )
-                        abort( "call to fromInt has index %d outside enumeration range %d-%d",
+                        abort( "call to fromInt has index %d outside of enumeration range %d-%d.",
                                    i, fromInstance( lower ), fromInstance( upper ) );
                 return fromInt_unsafe( i );
@@ -19 +19 @@
                 E upper = upperBound();
                 if ( fromInstance( e ) >= fromInstance( upper ) )
-                        abort( "call to succ() exceeds enumeration upper bound of %d", fromInstance( upper ) );
+                        abort( "call to succ() exceeds enumeration upper bound of %d.", fromInstance( upper ) );
                 return succ_unsafe(e);
         }
@@ -26 +26 @@
                 E lower = lowerBound();
                 if ( fromInstance( e ) <= fromInstance(lower ) )
-                        abort( "call to pred() exceeds enumeration lower bound of %d", fromInstance( lower ) );
+                        abort( "call to pred() exceeds enumeration lower bound of %d.", fromInstance( lower ) );
                 return pred_unsafe( e );
         }
 
-        int Countof( __attribute__((unused)) E e ) {
+        int Countof( E ) {
                 E upper = upperBound();
                 E lower = lowerBound();

libcfa/src/enum.hfa

@@ -19 +19 @@
         E succ( E e );
         E pred( E e );
-        int Countof( E e );
+        int Countof( E );
 }
 

libcfa/src/heap.cfa

@@ -10 +10 @@
 // Created On       : Tue Dec 19 21:58:35 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Apr  7 21:54:29 2024
-// Update Count     : 1644
+// Last Modified On : Wed Aug  7 10:14:47 2024
+// Update Count     : 1646
 //
 
@@ -582 +582 @@
                         __cfaabi_bits_print_buffer( STDERR_FILENO, helpText, sizeof(helpText),
                                                                                 "CFA warning (UNIX pid:%ld) : program terminating with %td(%#tx) bytes of storage allocated but not freed.\n"
-                                                                                "Possible cause is unfreed storage allocated by the program or system/library routines called from the program.\n",
+                                                                                "Possible cause is mismatched allocation/deallocation calls (malloc/free), direct constructor call without a direct destructor call, or system/library routines not freeing storage.\n",
                                                                                 (long int)getpid(), allocUnfreed, allocUnfreed ); // always print the UNIX pid
                 } // if