Changes in src/CodeGen/CodeGenerator.cc [0a81c3f:bf2438c]

File:

• src/CodeGen/CodeGenerator.cc (modified) (15 diffs)

src/CodeGen/CodeGenerator.cc

@@ -14 +14 @@
 //
 
-#include <algorithm>
-#include <iostream>
-#include <cassert>
-#include <list>
-
-#include "Parser/ParseNode.h"
-
-#include "SynTree/Declaration.h"
-#include "SynTree/Expression.h"
-#include "SynTree/Initializer.h"
-#include "SynTree/Statement.h"
-#include "SynTree/Type.h"
-#include "SynTree/Attribute.h"
-
-#include "Common/utility.h"
-#include "Common/UnimplementedError.h"
+#include <cassert>                   // for assert, assertf
+#include <list>                      // for _List_iterator, list, list<>::it...
 
 #include "CodeGenerator.h"
-#include "OperatorTable.h"
-#include "GenType.h"
-
-#include "InitTweak/InitTweak.h"
+#include "Common/SemanticError.h"    // for SemanticError
+#include "Common/UniqueName.h"       // for UniqueName
+#include "Common/utility.h"          // for CodeLocation, toString
+#include "GenType.h"                 // for genType
+#include "InitTweak/InitTweak.h"     // for getPointerBase
+#include "OperatorTable.h"           // for OperatorInfo, operatorLookup
+#include "Parser/LinkageSpec.h"      // for Spec, Intrinsic
+#include "SynTree/Attribute.h"       // for Attribute
+#include "SynTree/BaseSyntaxNode.h"  // for BaseSyntaxNode
+#include "SynTree/Constant.h"        // for Constant
+#include "SynTree/Declaration.h"     // for DeclarationWithType, TypeDecl
+#include "SynTree/Expression.h"      // for Expression, UntypedExpr, Applica...
+#include "SynTree/Initializer.h"     // for Initializer, ListInit, Designation
+#include "SynTree/Label.h"           // for Label, operator<<
+#include "SynTree/Statement.h"       // for Statement, AsmStmt, BranchStmt
+#include "SynTree/Type.h"            // for Type, Type::StorageClasses, Func...
 
 using namespace std;
@@ -65 +63 @@
                 } // if
         } // extension
+
+        ostream & CodeGenerator::Indenter::operator()( ostream & output ) const {
+          return output << string( cg.cur_indent, ' ' );
+        }
+
+        ostream & operator<<( ostream & output, const CodeGenerator::Indenter &indent ) {
+                return indent( output );
+        }
 
         CodeGenerator::LabelPrinter & CodeGenerator::LabelPrinter::operator()( std::list< Label > & l ) {
@@ -103 +109 @@
         }
 
-        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC, bool lineMarks ) : indent( CodeGenerator::tabsize ), insideFunction( false ), output( os ), printLabels( *this ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ) {}
+        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC, bool lineMarks ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ) {}
 
         string CodeGenerator::mangleName( DeclarationWithType * decl ) {
@@ -194 +200 @@
                         output << " {" << endl;
 
-                        ++indent;
+                        cur_indent += CodeGenerator::tabsize;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end(); i++ ) {
                                 output << lineDirective( *i ) << indent;
@@ -201 +207 @@
                         } // for
 
-                        --indent;
+                        cur_indent -= CodeGenerator::tabsize;
 
                         output << indent << "}";
@@ -231 +237 @@
                         output << " {" << endl;
 
-                        ++indent;
+                        cur_indent += CodeGenerator::tabsize;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end();  i++) {
                                 ObjectDecl * obj = dynamic_cast< ObjectDecl* >( *i );
@@ -243 +249 @@
                         } // for
 
-                        --indent;
+                        cur_indent -= CodeGenerator::tabsize;
 
                         output << indent << "}";
@@ -338 +344 @@
                         if ( varExpr->get_var()->get_linkage() == LinkageSpec::Intrinsic && operatorLookup( varExpr->get_var()->get_name(), opInfo ) ) {
                                 std::list< Expression* >::iterator arg = applicationExpr->get_args().begin();
+                                switch ( opInfo.type ) {
+                                  case OT_PREFIXASSIGN:
+                                  case OT_POSTFIXASSIGN:
+                                  case OT_INFIXASSIGN:
+                                  case OT_CTOR:
+                                  case OT_DTOR:
+                                        {
+                                                assert( arg != applicationExpr->get_args().end() );
+                                                if ( AddressExpr * addrExpr = dynamic_cast< AddressExpr * >( *arg ) ) {
+                                                        // remove & from first assignment/ctor argument
+                                                        *arg = addrExpr->get_arg();
+                                                } else {
+                                                        // no address-of operator, so must be a pointer - add dereference
+                                                        // NOTE: if the assertion starts to trigger, check that the application expr isn't being shared.
+                                                        // Since its arguments are modified here, this assertion most commonly triggers when the application
+                                                        // is visited multiple times.
+                                                        UntypedExpr * newExpr = new UntypedExpr( new NameExpr( "*?" ) );
+                                                        newExpr->get_args().push_back( *arg );
+                                                        Type * type = InitTweak::getPointerBase( (*arg)->get_result() );
+                                                        assertf( type, "First argument to a derefence must be a pointer. Ensure that expressions are not being shared." );
+                                                        newExpr->set_result( type->clone() );
+                                                        *arg = newExpr;
+                                                } // if
+                                                break;
+                                        }
+
+                                  default:
+                                        // do nothing
+                                        ;
+                                } // switch
+
                                 switch ( opInfo.type ) {
                                   case OT_INDEX:
@@ -716 +753 @@
                 std::list< Statement * > & stmts = stmtExpr->get_statements()->get_kids();
                 output << lineDirective( stmtExpr) << "({" << std::endl;
-                ++indent;
+                cur_indent += CodeGenerator::tabsize;
                 unsigned int numStmts = stmts.size();
                 unsigned int i = 0;
@@ -739 +776 @@
                         ++i;
                 }
-                --indent;
+                cur_indent -= CodeGenerator::tabsize;
                 output << indent << "})";
         }
@@ -748 +785 @@
                 output << "{" << endl;
 
-                ++indent;
+                cur_indent += CodeGenerator::tabsize;
 
                 for ( std::list<Statement *>::iterator i = ks.begin(); i != ks.end();  i++ ) {
@@ -759 +796 @@
                         } // if
                 } // for
-                --indent;
+                cur_indent -= CodeGenerator::tabsize;
 
                 output << indent << "}";
@@ -827 +864 @@
 
                 output << "{" << std::endl;
-                ++indent;
+                cur_indent += CodeGenerator::tabsize;
                 acceptAll( switchStmt->get_statements(), *this );
-                --indent;
+                cur_indent -= CodeGenerator::tabsize;
                 output << indent << "}";
         }
@@ -846 +883 @@
                 std::list<Statement *> sts = caseStmt->get_statements();
 
-                ++indent;
+                cur_indent += CodeGenerator::tabsize;
                 for ( std::list<Statement *>::iterator i = sts.begin(); i != sts.end();  i++) {
                         output << indent << printLabels( (*i)->get_labels() )  ;
@@ -852 +889 @@
                         output << endl;
                 } // for
-                --indent;
+                cur_indent -= CodeGenerator::tabsize;
         }