Changeset f6964ef

Timestamp:

May 17, 2019, 4:03:23 PM (5 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

7b149bc

Parents:

675d816 (diff), 172d9342 (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

Files:

• AST/Convert.cpp (modified) (3 diffs)
• AST/Pass.hpp (modified) (2 diffs)
• AST/TypeSubstitution.cpp (modified) (1 diff)
• AST/TypeSubstitution.hpp (modified) (2 diffs)
• AST/module.mk (added)
• SynTree/TypeSubstitution.cc (modified) (1 diff)
• SynTree/TypeSubstitution.h (modified) (2 diffs)

src/AST/Convert.cpp

@@ -16 +16 @@
 #include "Convert.hpp"
 
-#include "AST/Pass.hpp"
-
 #include "AST/Attribute.hpp"
 #include "AST/Decl.hpp"
@@ -23 +21 @@
 #include "AST/Init.hpp"
 #include "AST/Stmt.hpp"
-
+#include "AST/TypeSubstitution.hpp"
 
 #include "SynTree/Attribute.h"
 #include "SynTree/Declaration.h"
+#include "SynTree/TypeSubstitution.h"
 
 //================================================================================================
@@ -1172 +1171 @@
         }
 
+        ast::TypeSubstitution * convertTypeSubstitution(const TypeSubstitution * old) {
+
+                ast::TypeSubstitution *rslt = new ast::TypeSubstitution();
+
+                for (decltype(old->begin()) old_i = old->begin(); old_i != old->end(); old_i++) {
+                        rslt->add( old_i->first,
+                                   getAccept1<ast::Type>(old_i->second) );
+                }
+
+                for (decltype(old->beginVar()) old_i = old->beginVar(); old_i != old->endVar(); old_i++) {
+                        rslt->addVar( old_i->first,
+                                      getAccept1<ast::Expr>(old_i->second) );
+                }
+        }
+
+        void convertInferUnion(ast::Expr::InferUnion &nwInferred, InferredParams oldInferParams, const std::vector<UniqueId> &oldResnSlots) {
+                
+                (void) nwInferred;
+                (void) oldInferParams;
+                (void) oldResnSlots;
+                
+                // TODO
+        }
+
+        ast::Expr * visitBaseExpr(Expression * old, ast::Expr * nw) {
+
+                nw->result = GET_ACCEPT_1(result, Type);
+                nw->env    = convertTypeSubstitution(old->env);
+
+                nw->extension = old->extension;
+                convertInferUnion(nw->inferred, old->inferParams, old->resnSlots);
+
+                return nw;
+        }
+
         virtual void visit( ApplicationExpr * ) override final {
-
+                // TODO
         }
 
         virtual void visit( UntypedExpr * ) override final {
-
-        }
-
-        virtual void visit( NameExpr * ) override final {
-
+                // TODO
+        }
+
+        virtual void visit( NameExpr * old ) override final {
+                this->node = visitBaseExpr( old,
+                        new ast::NameExpr(
+                                old->location,
+                                old->get_name()
+                        )
+                );
         }
 
         virtual void visit( CastExpr * ) override final {
-
+                // TODO ... (rest)
         }
 

src/AST/Pass.hpp

@@ -300 +300 @@
 #include "Common/Stats.h"
 
+namespace ast {
 extern struct PassVisitorStats {
         size_t depth = 0;
@@ -305 +306 @@
         Stats::Counters::AverageCounter<double> * avg = nullptr;
 } pass_visitor_stats;
+}
 
 #include "AST/Pass.impl.hpp"

src/AST/TypeSubstitution.cpp

@@ -58 +58 @@
 void TypeSubstitution::add( std::string formalType, const Type *actualType ) {
         typeEnv[ formalType ] = actualType;
+}
+
+void TypeSubstitution::addVar( std::string formalExpr, const Expr *actualExpr ) {
+        varEnv[ formalExpr ] = actualExpr;
 }
 

src/AST/TypeSubstitution.hpp

@@ -52 +52 @@
         bool empty() const;
 
+        void addVar( std::string formalExpr, const Expr *actualExpr );
+
         template< typename FormalIterator, typename ActualIterator >
         void add( FormalIterator formalBegin, FormalIterator formalEnd, ActualIterator actualBegin );
@@ -87 +89 @@
         auto begin() const -> decltype( typeEnv.begin() ) { return typeEnv.begin(); }
         auto   end() const -> decltype( typeEnv.  end() ) { return typeEnv.  end(); }
+
+        auto beginVar()       -> decltype( varEnv.begin() ) { return varEnv.begin(); }
+        auto   endVar()       -> decltype( varEnv.  end() ) { return varEnv.  end(); }
+        auto beginVar() const -> decltype( varEnv.begin() ) { return varEnv.begin(); }
+        auto   endVar() const -> decltype( varEnv.  end() ) { return varEnv.  end(); }
 };
 

src/SynTree/TypeSubstitution.cc

@@ -62 +62 @@
         } // if
         typeEnv[ formalType ] = actualType->clone();
+}
+
+void TypeSubstitution::addVar( std::string formalExpr, Expression *actualExpr ) {
+        varEnv[ formalExpr ] = actualExpr;
 }
 

src/SynTree/TypeSubstitution.h

@@ -48 +48 @@
         bool empty() const;
 
+        void addVar( std::string formalExpr, Expression *actualExpr );
+
         template< typename FormalIterator, typename ActualIterator >
         void add( FormalIterator formalBegin, FormalIterator formalEnd, ActualIterator actualBegin );
@@ -89 +91 @@
         auto begin() const -> decltype( typeEnv.begin() ) { return typeEnv.begin(); }
         auto   end() const -> decltype( typeEnv.  end() ) { return typeEnv.  end(); }
+
+        auto beginVar()       -> decltype( varEnv.begin() ) { return varEnv.begin(); }
+        auto   endVar()       -> decltype( varEnv.  end() ) { return varEnv.  end(); }
+        auto beginVar() const -> decltype( varEnv.begin() ) { return varEnv.begin(); }
+        auto   endVar() const -> decltype( varEnv.  end() ) { return varEnv.  end(); }
 };