Changeset dbae916 for src/Parser/parserutility.h

Timestamp:

Mar 14, 2023, 4:21:05 PM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

1afd9ccb, 360bfe41, 6e6989c

Parents:

5217569 (diff), c19ca4b (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:

• src/Parser/parserutility.h (modified) (2 diffs)

src/Parser/parserutility.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:31:46 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr Feb 16 12:34:00 2023
-// Update Count     : 5
+// Last Modified On : Thr Mar  9 12:16:00 2023
+// Update Count     : 6
 //
 
@@ -20 +20 @@
 Expression *notZeroExpr( Expression *orig );
 
-template< typename T, typename U >
-struct maybeBuild_t {
-        static T * doit( const U *orig ) {
-                if ( orig ) {
-                        return orig->build();
-                } else {
-                        return 0;
-                }
-        }
-};
-
-template< typename T, typename U >
-static inline T * maybeBuild( const U *orig ) {
-        return maybeBuild_t<T,U>::doit(orig);
+template< typename T >
+static inline auto maybeBuild( const T *orig ) -> decltype(orig->build()) {
+        return (orig) ? orig->build() : nullptr;
 }
 
-template< typename T, typename U >
-static inline T * maybeMoveBuild( const U *orig ) {
-        T* ret = maybeBuild<T>(orig);
+template< typename T >
+static inline auto maybeMoveBuild( const T *orig ) -> decltype(orig->build()) {
+        auto ret = maybeBuild<T>(orig);
         delete orig;
         return ret;