Changeset 5f5083e for src

Timestamp:

Nov 10, 2016, 4:32:41 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

668e971a

Parents:

d073e3c

Message:

Fixed a few warnings in tuples

Location:

src

Files:

• ResolvExpr/Resolver.cc (modified) (1 diff)
• Tuples/TupleExpansion.cc (modified) (5 diffs)

src/ResolvExpr/Resolver.cc

@@ -72 +72 @@
                 Type * functionReturn = nullptr;
                 Type *initContext = nullptr;
-                Type *switchType = nullptr;
                 bool inEnumDecl = false;
         };

src/Tuples/TupleExpansion.cc

@@ -32 +32 @@
 namespace Tuples {
         namespace {
-                class MemberTupleExpander : public Mutator {
+                class MemberTupleExpander final : public Mutator {
                 public:
                         typedef Mutator Parent;
-                        virtual Expression * mutate( UntypedMemberExpr * memberExpr );
-                };
-
-                class UniqueExprExpander : public GenPoly::DeclMutator {
+                        using Parent::mutate;
+
+                        virtual Expression * mutate( UntypedMemberExpr * memberExpr ) override;
+                };
+
+                class UniqueExprExpander final : public GenPoly::DeclMutator {
                 public:
                         typedef GenPoly::DeclMutator Parent;
-
-                        virtual Expression * mutate( UniqueExpr * unqExpr );
+                        using Parent::mutate;
+
+                        virtual Expression * mutate( UniqueExpr * unqExpr ) override;
 
                         std::map< int, Expression * > decls; // not vector, because order added may not be increasing order
@@ -56 +59 @@
                 public:
                         typedef Mutator Parent;
+                        using Parent::mutate;
+
                         virtual Expression * mutate( TupleAssignExpr * tupleExpr );
                 };
@@ -62 +67 @@
                   public:
                         typedef GenPoly::DeclMutator Parent;
-
-                        virtual Type * mutate( TupleType * tupleType );
-
-                        virtual CompoundStmt * mutate( CompoundStmt * stmt ) {
+                        using Parent::mutate;
+
+                        virtual Type * mutate( TupleType * tupleType ) override;
+
+                        virtual CompoundStmt * mutate( CompoundStmt * stmt ) override {
                                 typeMap.beginScope();
                                 stmt = Parent::mutate( stmt );
@@ -75 +81 @@
                 };
 
-                class TupleIndexExpander : public Mutator {
+                class TupleIndexExpander final : public Mutator {
                 public:
                         typedef Mutator Parent;
-                        virtual Expression * mutate( TupleIndexExpr * tupleExpr );
-                };
-
-                class TupleExprExpander : public Mutator {
+                        using Parent::mutate;
+
+                        virtual Expression * mutate( TupleIndexExpr * tupleExpr ) override;
+                };
+
+                class TupleExprExpander final : public Mutator {
                 public:
                         typedef Mutator Parent;
-                        virtual Expression * mutate( TupleExpr * tupleExpr );
+                        using Parent::mutate;
+                        
+                        virtual Expression * mutate( TupleExpr * tupleExpr ) override;
                 };
         }
@@ -318 +328 @@
 // compile-command: "make install" //
 // End: //
-