Changeset 4e5e6cc for src

Timestamp:

Jun 7, 2019, 2:54:34 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

ef75948

Parents:

5684736

Message:

Fixed indentation and remove too strict abort

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (1 diff)
• Common/Indenter.h (modified) (2 diffs)
• InitTweak/FixInit.cc (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -116 +116 @@
         }
 
-        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC, bool lineMarks, bool printExprTypes ) : indent( CodeGenerator::tabsize ), output( os ), printLabels( *this ), options( pretty, genC, lineMarks, printExprTypes ), endl( *this ) {}
-        CodeGenerator::CodeGenerator( std::ostream & os, const Options &options ) : indent( CodeGenerator::tabsize ), output( os ), printLabels( *this ), options(options), endl( *this ) {}
+        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC, bool lineMarks, bool printExprTypes ) : indent( 0, CodeGenerator::tabsize ), output( os ), printLabels( *this ), options( pretty, genC, lineMarks, printExprTypes ), endl( *this ) {}
+        CodeGenerator::CodeGenerator( std::ostream & os, const Options &options ) : indent( 0, CodeGenerator::tabsize ), output( os ), printLabels( *this ), options(options), endl( *this ) {}
 
         string CodeGenerator::mangleName( DeclarationWithType * decl ) {

src/Common/Indenter.h

@@ -23 +23 @@
         unsigned int amt;         ///< spaces in one level of indentation
 
-        Indenter( unsigned int indent = 0, unsigned int amt = tabsize ) 
-        : indent( indent*amt ), amt( amt ) {}
-        
-        Indenter & operator+=(int nlevels) { indent += amt*nlevels; return *this; }
-        Indenter & operator-=(int nlevels) { indent -= amt*nlevels; return *this; }
+        Indenter( unsigned int indent = 0, unsigned int amt = tabsize )
+        : indent( indent ), amt( amt ) {}
+
+        Indenter & operator+=(int nlevels) { indent += nlevels; return *this; }
+        Indenter & operator-=(int nlevels) { indent -= nlevels; return *this; }
         Indenter operator+(int nlevels) { Indenter indenter = *this; return indenter += nlevels; }
         Indenter operator-(int nlevels) { Indenter indenter = *this; return indenter -= nlevels; }
@@ -35 +35 @@
 
 inline std::ostream & operator<<( std::ostream & out, const Indenter & indent ) {
-        return out << std::string(indent.indent, ' ');
+        return out << std::string(indent.indent * indent.amt, ' ');
 }
 

src/InitTweak/FixInit.cc

@@ -301 +301 @@
                                 replacement = new CastExpr( replacement, base->clone() );
                         }
-                        size_t replaced = DeclReplacer::replace( dtor, { std::make_pair( objDecl, replacement ) } );
-                        if(replaced == 0) {
-                                objDecl->print(std::cerr);
-                                std::cerr << "-----" << std::endl;
-                                dtor->print(std::cerr);
-                                std::cerr << "Failed to replace " << objDecl << std::endl;
-                                abort();
-                        }
+                        DeclReplacer::replace( dtor, { std::make_pair( objDecl, replacement ) } );
                         dtorFunc->statements->push_back( strict_dynamic_cast<Statement *>( dtor ) );