Changeset ff29f08 for src/CodeGen

Timestamp:

May 18, 2018, 2:09:21 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

2472a19

Parents:

f6f0cca3 (diff), c7d8100c (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 remote-tracking branch 'origin/master' into with_gc

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (9 diffs)
• CodeGenerator.h (modified) (1 diff)
• FixNames.cc (modified) (2 diffs)

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Sep  3 20:42:52 2017
-// Update Count     : 490
+// Last Modified On : Sat May  5 09:08:32 2018
+// Update Count     : 494
 //
 #include "CodeGenerator.h"
@@ -370 +370 @@
 
         void CodeGenerator::postvisit( Constant * constant ) {
-                output << constant->get_value() ;
+                output << constant->get_value();
         }
 
@@ -587 +587 @@
                 output << "(";
                 if ( castExpr->get_result()->isVoid() ) {
-                        output << "(void)" ;
+                        output << "(void)";
                 } else {
                         // at least one result type of cast.
@@ -878 +878 @@
                         } // for
                 } // if
-                output << " );" ;
+                output << " );";
         }
 
@@ -886 +886 @@
                 output << "( ";
                 if ( asmStmt->get_instruction() ) asmStmt->get_instruction()->accept( *visitor );
-                output << " )" ;
+                output << " )";
+        }
+
+        void CodeGenerator::postvisit( DirectiveStmt * dirStmt ) {
+                output << endl << dirStmt->directive;                   // endl prevents spaces before directive
         }
 
@@ -903 +907 @@
 
         void CodeGenerator::postvisit( SwitchStmt * switchStmt ) {
-                output << "switch ( " ;
+                output << "switch ( ";
                 switchStmt->get_condition()->accept( *visitor );
                 output << " ) ";
@@ -929 +933 @@
                 ++indent;
                 for ( std::list<Statement *>::iterator i = sts.begin(); i != sts.end();  i++) {
-                        output << indent << printLabels( (*i)->get_labels() )  ;
+                        output << indent << printLabels( (*i)->get_labels() ) ;
                         (*i)->accept( *visitor );
                         output << endl;
@@ -1066 +1070 @@
         void CodeGenerator::postvisit( WhileStmt * whileStmt ) {
                 if ( whileStmt->get_isDoWhile() ) {
-                        output << "do" ;
-                } else {
-                        output << "while (" ;
+                        output << "do";
+                } else {
+                        output << "while (";
                         whileStmt->get_condition()->accept( *visitor );
                         output << ")";
@@ -1080 +1084 @@
 
                 if ( whileStmt->get_isDoWhile() ) {
-                        output << " while (" ;
+                        output << " while (";
                         whileStmt->get_condition()->accept( *visitor );
                         output << ");";

src/CodeGen/CodeGenerator.h

@@ -99 +99 @@
                 void postvisit( ExprStmt * );
                 void postvisit( AsmStmt * );
+                void postvisit( DirectiveStmt * );
                 void postvisit( AsmDecl * );                            // special: statement in declaration context
                 void postvisit( IfStmt * );

src/CodeGen/FixNames.cc

@@ -55 +55 @@
                 auto && name = SymTab::Mangler::mangle( mainDecl );
                 // std::cerr << name << std::endl;
-                return name;
+                return std::move(name);
         }
         std::string mangle_main_args() {
@@ -78 +78 @@
                 auto&& name = SymTab::Mangler::mangle( mainDecl );
                 // std::cerr << name << std::endl;
-                return name;
+                return std::move(name);
         }