Changeset 62e5546 for src/ControlStruct

Timestamp:

Oct 27, 2016, 4:22:27 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:

0ebac75

Parents:

d93d980

Message:

Removed warnings when compiling with clang

Location:

src/ControlStruct

Files:

• LabelFixer.h (modified) (2 diffs)
• LabelTypeChecker.cc (modified) (3 diffs)

src/ControlStruct/LabelFixer.h

@@ -26 +26 @@
 namespace ControlStruct {
         /// normalizes label definitions and generates multi-level exit labels
-        class LabelFixer : public Visitor {
+        class LabelFixer final : public Visitor {
                 typedef Visitor Parent;
           public:
@@ -33 +33 @@
                 std::map < Label, Statement * > *resolveJumps() throw ( SemanticError );
 
+                using Visitor::visit;
+
                 // Declarations
-                virtual void visit( FunctionDecl *functionDecl );
+                virtual void visit( FunctionDecl *functionDecl ) override;
 
                 // Statements
                 void visit( Statement *stmt );
 
-                virtual void visit( CompoundStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-                virtual void visit( NullStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-                virtual void visit( ExprStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-                virtual void visit( IfStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-                virtual void visit( WhileStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-                virtual void visit( ForStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-                virtual void visit( SwitchStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-                virtual void visit( CaseStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-                virtual void visit( ReturnStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-                virtual void visit( TryStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-                virtual void visit( CatchStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-                virtual void visit( DeclStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-                virtual void visit( BranchStmt *branchStmt );
-                virtual void visit( UntypedExpr *untyped );
+                virtual void visit( CompoundStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+                virtual void visit( NullStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+                virtual void visit( ExprStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+                virtual void visit( IfStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+                virtual void visit( WhileStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+                virtual void visit( ForStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+                virtual void visit( SwitchStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+                virtual void visit( CaseStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+                virtual void visit( ReturnStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+                virtual void visit( TryStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+                virtual void visit( CatchStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+                virtual void visit( DeclStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+                virtual void visit( BranchStmt *branchStmt ) override;
+                virtual void visit( UntypedExpr *untyped ) override;
 
                 Label setLabelsDef( std::list< Label > &, Statement *definition );

src/ControlStruct/LabelTypeChecker.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// LabelTypeChecker.cc -- 
+// LabelTypeChecker.cc --
 //
 // Author           : Rodolfo G. Esteves
@@ -28 +28 @@
                 assert( untypedExpr != 0 );
                 NameExpr *fname;
-                if ( ((fname = dynamic_cast<NameExpr *>(untypedExpr->get_function())) != 0) 
+                if ( ((fname = dynamic_cast<NameExpr *>(untypedExpr->get_function())) != 0)
                          && fname->get_name() == std::string("&&") )
                         std::cerr << "Taking the label of an address." << std::endl;
@@ -58 +58 @@
 
                 NameExpr *name;
-                if ( ((name = dynamic_cast<NameExpr *>(target)) == 0) )
+                if ( (name = dynamic_cast<NameExpr *>(target)) == 0 )
                         return; // Not a name expression
-        
+
                 std::list< DeclarationWithType * > interps;
                 index.lookupId(name->get_name(), interps);