Changes in src/InitTweak/FixGlobalInit.cc [1cb934d:ea6332d]

File:

• src/InitTweak/FixGlobalInit.cc (modified) (6 diffs)

src/InitTweak/FixGlobalInit.cc

@@ -20 +20 @@
 #include <algorithm>               // for replace_if
 
-#include "Common/PassVisitor.h"
 #include "Common/SemanticError.h"  // for SemanticError
 #include "Common/UniqueName.h"     // for UniqueName
@@ -30 +29 @@
 #include "SynTree/Expression.h"    // for ConstantExpr, Expression (ptr only)
 #include "SynTree/Initializer.h"   // for ConstructorInit, Initializer
-#include "SynTree/Label.h"         // for Label
+#include "SynTree/Label.h"         // for Label, noLabels
 #include "SynTree/Statement.h"     // for CompoundStmt, Statement (ptr only)
 #include "SynTree/Type.h"          // for Type, Type::StorageClasses, Functi...
@@ -36 +35 @@
 
 namespace InitTweak {
-        class GlobalFixer : public WithShortCircuiting {
+        class GlobalFixer : public Visitor {
           public:
                 GlobalFixer( const std::string & name, bool inLibrary );
 
-                void previsit( ObjectDecl *objDecl );
-                void previsit( FunctionDecl *functionDecl );
-                void previsit( StructDecl *aggregateDecl );
-                void previsit( UnionDecl *aggregateDecl );
-                void previsit( EnumDecl *aggregateDecl );
-                void previsit( TraitDecl *aggregateDecl );
-                void previsit( TypeDecl *typeDecl );
+                virtual void visit( ObjectDecl *objDecl );
+                virtual void visit( FunctionDecl *functionDecl );
+                virtual void visit( StructDecl *aggregateDecl );
+                virtual void visit( UnionDecl *aggregateDecl );
+                virtual void visit( EnumDecl *aggregateDecl );
+                virtual void visit( TraitDecl *aggregateDecl );
+                virtual void visit( TypeDecl *typeDecl );
 
                 UniqueName tempNamer;
@@ -54 +53 @@
 
         void fixGlobalInit( std::list< Declaration * > & translationUnit, const std::string & name, bool inLibrary ) {
-                PassVisitor<GlobalFixer> visitor( name, inLibrary );
-                acceptAll( translationUnit, visitor );
-                GlobalFixer & fixer = visitor.pass;
+                GlobalFixer fixer( name, inLibrary );
+                acceptAll( translationUnit, fixer );
                 // don't need to include function if it's empty
                 if ( fixer.initFunction->get_statements()->get_kids().empty() ) {
@@ -94 +92 @@
                         dtorParameters.push_back( new ConstantExpr( Constant::from_int( 102 ) ) );
                 }
-                initFunction = new FunctionDecl( "_init_" + fixedName, Type::StorageClasses( Type::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt() );
+                initFunction = new FunctionDecl( "_init_" + fixedName, Type::StorageClasses( Type::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ) );
                 initFunction->get_attributes().push_back( new Attribute( "constructor", ctorParameters ) );
-                destroyFunction = new FunctionDecl( "_destroy_" + fixedName, Type::StorageClasses( Type::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt() );
+                destroyFunction = new FunctionDecl( "_destroy_" + fixedName, Type::StorageClasses( Type::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ) );
                 destroyFunction->get_attributes().push_back( new Attribute( "destructor", dtorParameters ) );
         }
 
-        void GlobalFixer::previsit( ObjectDecl *objDecl ) {
+        void GlobalFixer::visit( ObjectDecl *objDecl ) {
                 std::list< Statement * > & initStatements = initFunction->get_statements()->get_kids();
                 std::list< Statement * > & destroyStatements = destroyFunction->get_statements()->get_kids();
@@ -136 +134 @@
 
         // only modify global variables
-        void GlobalFixer::previsit( FunctionDecl * ) { visit_children = false; }
-        void GlobalFixer::previsit( StructDecl * ) { visit_children = false; }
-        void GlobalFixer::previsit( UnionDecl * ) { visit_children = false; }
-        void GlobalFixer::previsit( EnumDecl * ) { visit_children = false; }
-        void GlobalFixer::previsit( TraitDecl * ) { visit_children = false; }
-        void GlobalFixer::previsit( TypeDecl * ) { visit_children = false; }
+        void GlobalFixer::visit( __attribute__((unused)) FunctionDecl *functionDecl ) {}
+        void GlobalFixer::visit( __attribute__((unused)) StructDecl *aggregateDecl ) {}
+        void GlobalFixer::visit( __attribute__((unused)) UnionDecl *aggregateDecl ) {}
+        void GlobalFixer::visit( __attribute__((unused)) EnumDecl *aggregateDecl ) {}
+        void GlobalFixer::visit( __attribute__((unused)) TraitDecl *aggregateDecl ) {}
+        void GlobalFixer::visit( __attribute__((unused)) TypeDecl *typeDecl ) {}
 
 } // namespace InitTweak