Changeset 07ca4dd for src/AST

Timestamp:

Jun 18, 2019, 9:30:42 AM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

bc92bee

Parents:

8220e50 (diff), ea05f8d (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:

• Convert.cpp (modified) (4 diffs)
• TypeEnvironment.hpp (modified) (1 diff)
• porting.md (modified) (1 diff)

src/AST/Convert.cpp

@@ -10 +10 @@
 // Created On       : Thu May 09 15::37::05 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Man Jun 10 11:51:00 2019
-// Update Count     : 11
+// Last Modified On : Mon Jun 17 16:44:00 2019
+// Update Count     : 12
 //
 
@@ -949 +949 @@
         const ast::Expr * visit( const ast::TupleExpr * node ) override final {
                 auto expr = visitBaseExpr( node,
-                        new UntypedTupleExpr(
+                        new TupleExpr(
                                 get<Expression>().acceptL(node->exprs)
                         )
@@ -1470 +1470 @@
                 decl->mangleName = old->mangleName;
                 decl->isDeleted  = old->isDeleted;
+                decl->asmName    = GET_ACCEPT_1(asmName, Expr);
                 decl->uniqueId   = old->uniqueId;
                 decl->extension  = old->extension;
@@ -1494 +1495 @@
                 decl->mangleName = old->mangleName;
                 decl->isDeleted  = old->isDeleted;
+                decl->asmName    = GET_ACCEPT_1(asmName, Expr);
                 decl->uniqueId   = old->uniqueId;
                 decl->extension  = old->extension;

src/AST/TypeEnvironment.hpp

@@ -215 +215 @@
 std::ostream & operator<<( std::ostream & out, const TypeEnvironment & env );
 
-}
+} // namespace ast
 
 // Local Variables: //

src/AST/porting.md

@@ -302 +302 @@
 * `ExplodedActual.h` => `ExplodedArg.hpp`
 
+`polyCost`
+* switched order of `env`, `symtab` parameters for better consistency
+
 [1] https://gcc.gnu.org/onlinedocs/gcc-9.1.0/gcc/Type-Attributes.html#Type-Attributes