Changeset a935892 for src/AST/Convert.cpp

Timestamp:

Jun 3, 2019, 10:54:01 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

0e315a5, dafe9e1

Parents:

043a5b6 (diff), 8d70648 (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

File:

• src/AST/Convert.cpp (modified) (5 diffs)

src/AST/Convert.cpp

@@ -10 +10 @@
 // Created On       : Thu May 09 15::37::05 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed May 29 11:05:00 2019
-// Update Count     : 8
+// Last Modified On : Wed May 29 17:05:00 2019
+// Update Count     : 9
 //
 
@@ -77 +77 @@
                 std::list< T * > acceptL( const U & container ) {
                         std::list< T * > ret;
-                        for (auto ptr : container ) {
+                        for ( auto ptr : container ) {
                                 ret.emplace_back( accept1( ptr ) );
                         }
@@ -168 +168 @@
                         LinkageSpec::Spec( node->linkage.val ),
                         get<FunctionType>().accept1( node->type ),
-                        get<CompoundStmt>().accept1( node->stmts ),
+                        {},
                         get<Attribute>().acceptL( node->attributes ),
                         Type::FuncSpecifiers( node->funcSpec.val )
                 );
+                cache.emplace( node, decl );
+                decl->statements = get<CompoundStmt>().accept1( node->stmts );
                 decl->withExprs = get<Expression>().acceptL( node->withExprs );
                 if ( dereferenceOperator == node ) {
@@ -1446 +1448 @@
                         old->name,
                         GET_ACCEPT_1(type, FunctionType),
-                        GET_ACCEPT_1(statements, CompoundStmt),
+                        {},
                         { old->storageClasses.val },
                         { old->linkage.val },
@@ -1453 +1455 @@
                 };
                 cache.emplace( old, decl );
+                decl->withExprs = GET_ACCEPT_V(withExprs, Expr);
+                decl->stmts = GET_ACCEPT_1(statements, CompoundStmt);
                 decl->scopeLevel = old->scopeLevel;
                 decl->mangleName = old->mangleName;