Changeset 25793da

Timestamp:

Sep 14, 2022, 4:36:56 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

95e5018

Parents:

01865fb (diff), ce31925 (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:

• Concurrency/WaitforNew.cpp (modified) (1 diff)
• ControlStruct/ExceptTranslateNew.cpp (modified) (2 diffs)
• GenPoly/InstantiateGenericNew.cpp (modified) (1 diff)
• GenPoly/SpecializeNew.cpp (modified) (1 diff)
• Tuples/TupleExpansionNew.cpp (modified) (2 diffs)
• Virtual/ExpandCasts.cc (modified) (1 diff)
• main.cc (modified) (4 diffs)

src/Concurrency/WaitforNew.cpp

@@ -101 +101 @@
 namespace {
 
-class GenerateWaitForCore :
+class GenerateWaitForCore final :
                 public ast::WithSymbolTable, public ast::WithConstTranslationUnit {
         const ast::FunctionDecl * decl_waitfor    = nullptr;

src/ControlStruct/ExceptTranslateNew.cpp

@@ -32 +32 @@
         }
 
-class TranslateThrowsCore : public ast::WithGuards {
+class TranslateThrowsCore final : public ast::WithGuards {
         const ast::ObjectDecl * terminateHandlerExcept;
         enum Context { NoHandler, TerHandler, ResHandler } currentContext;
@@ -136 +136 @@
 
 
-class TryMutatorCore {
+class TryMutatorCore final {
         // The built in types used in translation.
         const ast::StructDecl * except_decl;

src/GenPoly/InstantiateGenericNew.cpp

@@ -85 +85 @@
 
 /// Maps a key and a TypeList to a valuue. Also supports scoping.
-class InstantiationMap {
+class InstantiationMap final {
         /// Wraps value for a specific (AggregateDecl, TypeList) combination.
         using Instantiation = std::pair<TypeList, ast::ptr<ast::AggregateDecl>>;

src/GenPoly/SpecializeNew.cpp

@@ -240 +240 @@
 }
 
-namespace {
-        struct TypeInstFixer : public ast::WithShortCircuiting {
-                std::map<const ast::TypeDecl *, std::pair<int, int>> typeMap;
-
-                void previsit(const ast::TypeDecl *) { visit_children = false; }
-                const ast::TypeInstType * postvisit(const ast::TypeInstType * typeInst) {
-                        if (typeMap.count(typeInst->base)) {
-                                ast::TypeInstType * newInst = mutate(typeInst);
-                                auto const & pair = typeMap[typeInst->base];
-                                newInst->expr_id = pair.first;
-                                newInst->formal_usage = pair.second;
-                                return newInst;
-                        }
-                        return typeInst;
-                }
-        };
-}
+struct TypeInstFixer final : public ast::WithShortCircuiting {
+        std::map<const ast::TypeDecl *, std::pair<int, int>> typeMap;
+
+        void previsit(const ast::TypeDecl *) { visit_children = false; }
+        const ast::TypeInstType * postvisit(const ast::TypeInstType * typeInst) {
+                if (typeMap.count(typeInst->base)) {
+                        ast::TypeInstType * newInst = mutate(typeInst);
+                        auto const & pair = typeMap[typeInst->base];
+                        newInst->expr_id = pair.first;
+                        newInst->formal_usage = pair.second;
+                        return newInst;
+                }
+                return typeInst;
+        }
+};
 
 const ast::Expr * SpecializeCore::createThunkFunction(

src/Tuples/TupleExpansionNew.cpp

@@ -101 +101 @@
 
 /// Replaces Tuple Assign & Index Expressions, and Tuple Types.
-struct TupleMainExpander :
+struct TupleMainExpander final :
                 public ast::WithGuards,
                 public ast::WithVisitorRef<TupleMainExpander>,
@@ -254 +254 @@
 }
 
-struct TupleExprExpander {
+struct TupleExprExpander final {
         ast::Expr const * postvisit( ast::TupleExpr const * expr ) {
                 return replaceTupleExpr( expr->location,

src/Virtual/ExpandCasts.cc

@@ -317 +317 @@
 };
 
-struct ExpandCastsCore {
+struct ExpandCastsCore final {
         void previsit( ast::FunctionDecl const * decl );
         void previsit( ast::StructDecl const * decl );

src/main.cc

@@ -623 +623 @@
 
 
-static const char optstring[] = ":c:ghlLmNnpdOAP:S:twW:D:";
+static const char optstring[] = ":c:ghlLmNnpdP:S:twW:D:";
 
 enum { PreludeDir = 128 };
@@ -637 +637 @@
         { "prototypes", no_argument, nullptr, 'p' },
         { "deterministic-out", no_argument, nullptr, 'd' },
-        { "old-ast", no_argument, nullptr, 'O'},
-        { "new-ast", no_argument, nullptr, 'A'},
         { "print", required_argument, nullptr, 'P' },
         { "prelude-dir", required_argument, nullptr, PreludeDir },
@@ -660 +658 @@
         "do not generate prelude prototypes => prelude not printed", // -p
         "only print deterministic output",                  // -d
-        "Use the old-ast",                                                                      // -O
-        "Use the new-ast",                                                                      // -A
         "print",                                                                                        // -P
         "<directory> prelude directory for debug/nodebug",      // no flag
@@ -770 +766 @@
                         deterministic_output = true;
                         break;
-                  case 'O':                                     // don't print non-deterministic output
-                        useNewAST = false;
-                        break;
-                  case 'A':                                     // don't print non-deterministic output
-                        useNewAST = true;
-                        break;
                   case 'P':                                                                             // print options
                         for ( int i = 0;; i += 1 ) {