Changeset 3ca540f for src/CodeGen

Timestamp:

Dec 1, 2017, 2:55:41 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

a40d503

Parents:

882ad37 (diff), 5da9d6a (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' into with-statement

Location:

src/CodeGen

Files:

• FixNames.cc (modified) (5 diffs)
• FixNames.h (modified) (2 diffs)

src/CodeGen/FixNames.cc

@@ -19 +19 @@
 #include <string>                  // for string, operator!=, operator==
 
+#include "Common/PassVisitor.h"
 #include "Common/SemanticError.h"  // for SemanticError
 #include "FixMain.h"               // for FixMain
@@ -32 +33 @@
 
 namespace CodeGen {
-        class FixNames : public Visitor {
+        class FixNames : public WithGuards {
           public:
-                virtual void visit( ObjectDecl *objectDecl );
-                virtual void visit( FunctionDecl *functionDecl );
+                void postvisit( ObjectDecl *objectDecl );
+                void postvisit( FunctionDecl *functionDecl );
 
-                virtual void visit( CompoundStmt *compoundStmt );
+                void previsit( CompoundStmt *compoundStmt );
           private:
                 int scopeLevel = 1;
@@ -93 +94 @@
         }
 
-        void fixNames( std::list< Declaration* > translationUnit ) {
-                FixNames fixer;
+        void fixNames( std::list< Declaration* > & translationUnit ) {
+                PassVisitor<FixNames> fixer;
                 acceptAll( translationUnit, fixer );
         }
 
-        void FixNames::fixDWT( DeclarationWithType *dwt ) {
+        void FixNames::fixDWT( DeclarationWithType * dwt ) {
                 if ( dwt->get_name() != "" ) {
                         if ( LinkageSpec::isMangled( dwt->get_linkage() ) ) {
@@ -107 +108 @@
         }
 
-        void FixNames::visit( ObjectDecl *objectDecl ) {
-                Visitor::visit( objectDecl );
+        void FixNames::postvisit( ObjectDecl * objectDecl ) {
                 fixDWT( objectDecl );
         }
 
-        void FixNames::visit( FunctionDecl *functionDecl ) {
-                Visitor::visit( functionDecl );
+        void FixNames::postvisit( FunctionDecl * functionDecl ) {
                 fixDWT( functionDecl );
 
@@ -121 +120 @@
                                 throw SemanticError("Main expected to have 0, 2 or 3 arguments\n", functionDecl);
                         }
-                        functionDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new ConstantExpr( Constant::from_int( 0 ) ) ) );
+                        functionDecl->get_statements()->get_kids().push_back( new ReturnStmt( new ConstantExpr( Constant::from_int( 0 ) ) ) );
                         CodeGen::FixMain::registerMain( functionDecl );
                 }
         }
 
-        void FixNames::visit( CompoundStmt *compoundStmt ) {
+        void FixNames::previsit( CompoundStmt * ) {
                 scopeLevel++;
-                Visitor::visit( compoundStmt );
-                scopeLevel--;
+                GuardAction( [this](){ scopeLevel--; } );
         }
 } // namespace CodeGen

src/CodeGen/FixNames.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FixNames.h -- 
+// FixNames.h --
 //
 // Author           : Richard C. Bilson
@@ -22 +22 @@
 namespace CodeGen {
         /// mangles object and function names
-        void fixNames( std::list< Declaration* > translationUnit );
+        void fixNames( std::list< Declaration* > & translationUnit );
 } // namespace CodeGen