Changeset 53d55b6 for src

Timestamp:

Oct 27, 2020, 4:14:48 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

1be1e5a, b35ab2d

Parents:

5d2db68

Message:

Changed approach for isInFunction and implemented for old ast

Location:

src

Files:

• AST/Pass.hpp (modified) (4 diffs)
• AST/Pass.proto.hpp (modified) (1 diff)
• Common/PassVisitor.h (modified) (2 diffs)

src/AST/Pass.hpp

@@ -65 +65 @@
 //                           corresponding postvisit/postmutate teminates.
 // | WithVisitorRef        - provides an pointer to the templated visitor wrapper
-// | WithIsInFuncion       - provides a way to access the inFunction
 // | WithSymbolTable       - provides symbol table functionality
 // | WithForallSubstitutor - maintains links between TypeInstType and TypeDecl under mutation
@@ -89 +88 @@
                 if(visitor) {
                         *const_cast<type **>( visitor ) = this;
-                }
-
-                // After the pass is constructed, check if it wants to track the inFunction field
-                const bool * const * infunc_ptr = __pass::infunc_ptr(core, 0);
-                if(infunc_ptr) {
-                        *const_cast<const bool **>( infunc_ptr ) = &this->inFunction;
                 }
         }
@@ -235 +228 @@
         template<typename core_type>
         friend void accept_all( std::list< ptr<Decl> > & decls, Pass<core_type>& visitor );
+
+        bool isInFunction() const {
+                return inFunction;
+        }
+
 private:
 
@@ -385 +383 @@
 struct WithVisitorRef {
         Pass<core_t> * const visitor = nullptr;
-};
-
-/// Used to track whether or not we are in a function.
-class WithIsInFuncion {
-        const bool * const infunc_ptr = nullptr;
-
-        template<typename core_t>
-        friend class Pass;
-public:
-        bool isInFunction() {
-                assert( infunc_ptr );
-                return *infunc_ptr;
+
+        bool isInFunction() const {
+                return visitor->isInFunction();
         }
 };

src/AST/Pass.proto.hpp

@@ -244 +244 @@
         FIELD_PTR( at_cleanup, __pass::at_cleanup_t )
         FIELD_PTR( visitor, ast::Pass<core_t> * const )
-        FIELD_PTR( infunc_ptr, const bool * const )
 
         // Remove the macro to make sure we don't clash

src/Common/PassVisitor.h

@@ -354 +354 @@
         virtual TypeSubstitution * mutate( TypeSubstitution * sub ) final;
 
+        bool isInFunction() const {
+                return inFunction;
+        }
+
 private:
         bool inFunction = false;
@@ -526 +530 @@
 public:
         PassVisitor<pass_type> * const visitor = nullptr;
+
+        bool isInFunction() const {
+                return visitor->inFunction;
+        }
 };