Changeset caa649b for src/SynTree

Timestamp:

Mar 6, 2018, 12:11:11 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

520145b, e5d4e5c, e6c5e79

Parents:

094476d (diff), 1feb535f (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

Location:

src/SynTree

Files:

• Mutator.cc (deleted)
• Mutator.h (modified) (1 diff)
• TypeSubstitution.cc (modified) (1 diff)
• TypeSubstitution.h (modified) (2 diffs)
• Visitor.cc (deleted)
• Visitor.h (modified) (1 diff)
• module.mk (modified) (1 diff)

src/SynTree/Mutator.h

@@ -22 +22 @@
 class Mutator {
   protected:
-        Mutator();
-        virtual ~Mutator();
+        Mutator() = default;
+        virtual ~Mutator() = default;
   public:
         virtual DeclarationWithType * mutate( ObjectDecl * objectDecl ) = 0;

src/SynTree/TypeSubstitution.cc

@@ -104 +104 @@
 bool TypeSubstitution::empty() const {
         return typeEnv.empty() && varEnv.empty();
+}
+
+namespace {
+        struct EnvTrimmer {
+                TypeSubstitution * env, * newEnv;
+                EnvTrimmer( TypeSubstitution * env, TypeSubstitution * newEnv ) : env( env ), newEnv( newEnv ){}
+                void previsit( TypeDecl * tyDecl ) {
+                        // transfer known bindings for seen type variables
+                        if ( Type * t = env->lookup( tyDecl->name ) ) {
+                                newEnv->add( tyDecl->name, t );
+                        }
+                }
+        };
+} // namespace
+
+/// reduce environment to just the parts that are referenced in a given expression
+TypeSubstitution * TypeSubstitution::newFromExpr( Expression * expr, TypeSubstitution * env ) {
+        if ( env ) {
+                TypeSubstitution * newEnv = new TypeSubstitution();
+                PassVisitor<EnvTrimmer> trimmer( env, newEnv );
+                expr->accept( trimmer );
+                return newEnv;
+        }
+        return nullptr;
 }
 

src/SynTree/TypeSubstitution.h

@@ -55 +55 @@
         void extract( TypeInstListIterator begin, TypeInstListIterator end, TypeSubstitution &result );
 
+        /// create a new TypeSubstitution using bindings from env containing all of the type variables in expr
+        static TypeSubstitution * newFromExpr( Expression * expr, TypeSubstitution * env );
+
         void normalize();
 
@@ -79 +82 @@
         TypeEnvType typeEnv;
         VarEnvType varEnv;
+
+  public:
+        // has to come after declaration of typeEnv
+        auto begin()       -> decltype( typeEnv.begin() ) { return typeEnv.begin(); }
+        auto   end()       -> decltype( typeEnv.  end() ) { return typeEnv.  end(); }
+        auto begin() const -> decltype( typeEnv.begin() ) { return typeEnv.begin(); }
+        auto   end() const -> decltype( typeEnv.  end() ) { return typeEnv.  end(); }
 };
 

src/SynTree/Visitor.h

@@ -21 +21 @@
 class Visitor {
   protected:
-        Visitor();
-        virtual ~Visitor();
+        Visitor() = default;
+        virtual ~Visitor() = default;
   public:
         // visit: Default implementation of all functions visits the children

src/SynTree/module.mk

@@ -46 +46 @@
        SynTree/TypeDecl.cc \
        SynTree/Initializer.cc \
-       SynTree/Visitor.cc \
-       SynTree/Mutator.cc \
        SynTree/TypeSubstitution.cc \
        SynTree/Attribute.cc \