Changeset 4b60b28

Timestamp:

Feb 16, 2023, 12:52:23 PM (14 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

1c80f20

Parents:

26e6d88

Message:

Moved parser utility from common utility file to the parserutility file.

Location:

src

Files:

• Common/utility.h (modified) (2 diffs)
• Parser/ParseNode.h (modified) (1 diff)
• Parser/parserutility.h (modified) (2 diffs)

src/Common/utility.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Apr 25 14:26:00 2022
-// Update Count     : 51
+// Last Modified On : Thr Feb 16 12:35:00 2023
+// Update Count     : 52
 //
 
@@ -49 +49 @@
                 return 0;
         } // if
-}
-
-template< typename T, typename U >
-struct maybeBuild_t {
-        static T * doit( const U *orig ) {
-                if ( orig ) {
-                        return orig->build();
-                } else {
-                        return 0;
-                } // if
-        }
-};
-
-template< typename T, typename U >
-static inline T * maybeBuild( const U *orig ) {
-        return maybeBuild_t<T,U>::doit(orig);
-}
-
-template< typename T, typename U >
-static inline T * maybeMoveBuild( const U *orig ) {
-        T* ret = maybeBuild<T>(orig);
-        delete orig;
-        return ret;
 }
 

src/Parser/ParseNode.h

@@ -27 +27 @@
 #include "Common/SemanticError.h"  // for SemanticError
 #include "Common/UniqueName.h"     // for UniqueName
-#include "Common/utility.h"        // for maybeClone, maybeBuild
+#include "Common/utility.h"        // for maybeClone
+#include "Parser/parserutility.h"  // for maybeBuild
 #include "SynTree/LinkageSpec.h"   // for Spec
 #include "SynTree/Declaration.h"   // for Aggregate

src/Parser/parserutility.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// parserutility.h -- 
+// parserutility.h -- Collected utilities for the parser.
 //
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 15:31:46 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:32:58 2017
-// Update Count     : 4
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr Feb 16 12:34:00 2023
+// Update Count     : 5
 //
 
@@ -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, typename U >
+static inline T * maybeMoveBuild( const U *orig ) {
+        T* ret = maybeBuild<T>(orig);
+        delete orig;
+        return ret;
+}
+
 // Local Variables: //
 // tab-width: 4 //