Changeset 175f9f4 for src/AST

Timestamp:

Jan 18, 2022, 1:16:23 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

1e8b4b49, adfd125

Parents:

21a5bfb7 (diff), 91a72ef (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/AST

Files:

• Decl.cpp (modified) (2 diffs)
• Decl.hpp (modified) (2 diffs)
• Eval.hpp (modified) (1 diff)

src/AST/Decl.cpp

@@ -26 +26 @@
 #include "Node.hpp"            // for readonly
 #include "Type.hpp"            // for readonly
+#include "Expr.hpp"
 
 namespace ast {
@@ -65 +66 @@
         for (auto & tp : this->type_params) {
                 ftype->forall.emplace_back(new TypeInstType(tp->name, tp));
+                for (auto & ap: tp->assertions) {
+                        ftype->assertions.emplace_back(new VariableExpr(loc, ap));
+                }
         }
         this->type = ftype;

src/AST/Decl.hpp

@@ -34 +34 @@
 // Must be included in *all* AST classes; should be #undef'd at the end of the file
 #define MUTATE_FRIEND \
-    template<typename node_t> friend node_t * mutate(const node_t * node); \
+        template<typename node_t> friend node_t * mutate(const node_t * node); \
         template<typename node_t> friend node_t * shallowCopy(const node_t * node);
 
@@ -135 +135 @@
         std::vector< ptr<Expr> > withExprs;
 
-
         FunctionDecl( const CodeLocation & loc, const std::string & name, std::vector<ptr<TypeDecl>>&& forall,
                 std::vector<ptr<DeclWithType>>&& params, std::vector<ptr<DeclWithType>>&& returns,

src/AST/Eval.hpp

@@ -24 +24 @@
 template< typename... Args >
 UntypedExpr * call( const CodeLocation & loc, const std::string & name, Args &&... args ) {
-        return new UntypedExpr { 
-                loc, new NameExpr { loc, name }, 
+        return new UntypedExpr {
+                loc, new NameExpr { loc, name },
                 std::vector< ptr< Expr > > { std::forward< Args >( args )... } };
 }