Changeset 81da3da4 for src/Concurrency/Keywords.cpp

Timestamp:

Dec 11, 2023, 4:18:13 AM (22 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

21ce2c7, 2554f24

Parents:

5ddb8bf (diff), 1c85ffc (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/Concurrency/Keywords.cpp (moved) (moved from src/Concurrency/KeywordsNew.cpp ) (7 diffs)

src/Concurrency/Keywords.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// KeywordsNew.cpp -- Implement concurrency constructs from their keywords.
+// Keywords.cpp -- Implement concurrency constructs from their keywords.
 //
 // Author           : Andrew Beach
@@ -14 +14 @@
 //
 
+#include "Concurrency/Keywords.h"
+
 #include <iostream>
-
-#include "Concurrency/Keywords.h"
 
 #include "AST/Copy.hpp"
@@ -30 +30 @@
 #include "Common/utility.h"
 #include "Common/UniqueName.h"
-#include "ControlStruct/LabelGeneratorNew.hpp"
+#include "ControlStruct/LabelGenerator.hpp"
 #include "InitTweak/InitTweak.h"
 #include "Virtual/Tables.h"
@@ -482 +482 @@
                 location,
                 getter_name,
-                {}, // forall
                 { this_decl }, // params
                 { ret_decl }, // returns
@@ -499 +498 @@
                         location,
                         "main",
-                        {},
                         { ast::deepCopy( this_decl ) },
                         {},
@@ -575 +573 @@
                 location,
                 "lock",
-                { /* forall */ },
                 {
                         // Copy the declaration of this.
@@ -607 +604 @@
                 location,
                 "unlock",
-                { /* forall */ },
                 {
                         // Last use, consume the declaration of this.