Changeset 33b7d49 for src/Common

Timestamp:

Mar 15, 2022, 10:14:05 AM (4 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

48a91e2

Parents:

d824715

Message:

Added another check to checkInvariants for code locations. I also went through and made sure you can put it every after every new AST pass not followed by a forceFillCodeLocations.

Location:

src/Common

Files:

• CodeLocationTools.cpp (modified) (3 diffs)
• CodeLocationTools.hpp (modified) (2 diffs)

src/Common/CodeLocationTools.cpp

@@ -9 +9 @@
 // Author           : Andrew Beach
 // Created On       : Fri Dec  4 15:42:00 2020
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  1 09:14:39 2022
-// Update Count     : 3
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Mar 14 15:14:00 2022
+// Update Count     : 4
 //
 
@@ -239 +239 @@
 };
 
+class LocalFillCore : public ast::WithGuards {
+        CodeLocation const * parent;
+public:
+        LocalFillCore( CodeLocation const & location ) : parent( &location ) {
+                assert( location.isSet() );
+        }
+
+        template<typename node_t>
+        auto previsit( node_t const * node )
+                        -> typename std::enable_if<has_code_location<node_t>::value, node_t const *>::type {
+                if ( node->location.isSet() ) {
+                        GuardValue( parent ) = &node->location;
+                        return node;
+                } else {
+                        node_t * mut = ast::mutate( node );
+                        mut->location = *parent;
+                        return mut;
+                }
+        }
+};
+
 } // namespace
 
@@ -278 +299 @@
         ast::Pass<FillCore>::run( unit );
 }
+
+ast::Node const * localFillCodeLocations(
+                CodeLocation const & location , ast::Node const * node ) {
+        ast::Pass<LocalFillCore> visitor( location );
+        return node->accept( visitor );
+}

src/Common/CodeLocationTools.hpp

@@ -10 +10 @@
 // Created On       : Fri Dec  4 15:35:00 2020
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Dec  9  9:53:00 2020
-// Update Count     : 1
+// Last Modified On : Mon Mar 14 15:14:00 2022
+// Update Count     : 2
 //
 
 #pragma once
 
+class CodeLocation;
 namespace ast {
+        class Node;
         class TranslationUnit;
 }
@@ -28 +30 @@
 // Assign a nearby code-location to any unset code locations in the forest.
 void forceFillCodeLocations( ast::TranslationUnit & unit );
+
+// Fill in code-locations with a parent code location,
+// using the provided CodeLocation as the base.
+ast::Node const *
+        localFillCodeLocations( CodeLocation const &, ast::Node const * );