Changeset deda7e6 for libcfa/src/collections/string.cfa

Timestamp:

Sep 21, 2023, 10:15:58 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

62c6cfa

Parents:

c1e66d9 (diff), 5a1ae14 (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

@@ -157 +157 @@
 // Comparison
 
-bool ?==?(const string & s, const string & other) {
-    return *s.inner == *other.inner;
-}
-
-bool ?!=?(const string & s, const string & other) {
-    return *s.inner != *other.inner;
-}
-
-bool ?==?(const string & s, const char * other) {
-    return *s.inner == other;
-}
-
-bool ?!=?(const string & s, const char * other) {
-    return *s.inner != other;
-}
+int  cmp (const string &s1, const string &s2) { return cmp(*s1.inner ,  *s2.inner); }
+bool ?==?(const string &s1, const string &s2) { return     *s1.inner == *s2.inner ; }
+bool ?!=?(const string &s1, const string &s2) { return     *s1.inner != *s2.inner ; }
+bool ?>? (const string &s1, const string &s2) { return     *s1.inner >  *s2.inner ; }
+bool ?>=?(const string &s1, const string &s2) { return     *s1.inner >= *s2.inner ; }
+bool ?<=?(const string &s1, const string &s2) { return     *s1.inner <= *s2.inner ; }
+bool ?<? (const string &s1, const string &s2) { return     *s1.inner <  *s2.inner ; }
+
+int  cmp (const string &s1, const char*   s2) { return cmp(*s1.inner ,   s2      ); }
+bool ?==?(const string &s1, const char*   s2) { return     *s1.inner ==  s2       ; }
+bool ?!=?(const string &s1, const char*   s2) { return     *s1.inner !=  s2       ; }
+bool ?>? (const string &s1, const char*   s2) { return     *s1.inner >   s2       ; }
+bool ?>=?(const string &s1, const char*   s2) { return     *s1.inner >=  s2       ; }
+bool ?<=?(const string &s1, const char*   s2) { return     *s1.inner <=  s2       ; }
+bool ?<? (const string &s1, const char*   s2) { return     *s1.inner <   s2       ; }
+
+int  cmp (const char*   s1, const string &s2) { return cmp( s1       ,  *s2.inner); }
+bool ?==?(const char*   s1, const string &s2) { return      s1       == *s2.inner ; }
+bool ?!=?(const char*   s1, const string &s2) { return      s1       != *s2.inner ; }
+bool ?>? (const char*   s1, const string &s2) { return      s1       >  *s2.inner ; }
+bool ?>=?(const char*   s1, const string &s2) { return      s1       >= *s2.inner ; }
+bool ?<=?(const char*   s1, const string &s2) { return      s1       <= *s2.inner ; }
+bool ?<? (const char*   s1, const string &s2) { return      s1       <  *s2.inner ; }
+
 
 ////////////////////////////////////////////////////////