Changeset 32cab5b for src/CodeGen

Timestamp:

Apr 17, 2018, 12:01:09 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, stuck-waitfor-destruct, with_gc

Children:

3265399

Parents:

b2fe1c9 (diff), 81bb114 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (4 diffs)
• CodeGenerator.h (modified) (1 diff)
• OperatorTable.cc (modified) (2 diffs)
• OperatorTable.h (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -203 +203 @@
 
         void CodeGenerator::handleAggregate( AggregateDecl * aggDecl, const std::string & kind ) {
-                genAttributes( aggDecl->get_attributes() );
-
                 if( ! aggDecl->get_parameters().empty() && ! genC ) {
                         // assertf( ! genC, "Aggregate type parameters should not reach code generation." );
@@ -213 +211 @@
                 }
 
-                output << kind << aggDecl->get_name();
+                output << kind;
+                genAttributes( aggDecl->get_attributes() );
+                output << aggDecl->get_name();
 
                 if ( aggDecl->has_body() ) {
@@ -298 +298 @@
                         output << " }";
                 }
+        }
+
+        void CodeGenerator::postvisit( StaticAssertDecl * assertDecl ) {
+                output << "_Static_assert(";
+                assertDecl->condition->accept( *visitor );
+                output << ", ";
+                assertDecl->message->accept( *visitor );
+                output << ")";
         }
 
@@ -928 +936 @@
                         output << "continue";
                         break;
+                  case BranchStmt::FallThrough:
+                  case BranchStmt::FallThroughDefault:
+                        assertf( ! genC, "fallthru should not reach code generation." );
+                  output << "fallthru";
+                        break;
                 } // switch
+                // print branch target for labelled break/continue/fallthru in debug mode
+                if ( ! genC && branchStmt->get_type() != BranchStmt::Goto ) {
+                        if ( ! branchStmt->get_target().empty() ) {
+                                output << " " << branchStmt->get_target();
+                        } else if ( branchStmt->get_type() == BranchStmt::FallThrough ) {
+                                output << " default";
+                        }
+                }
                 output << ";";
         }

src/CodeGen/CodeGenerator.h

@@ -42 +42 @@
                 void postvisit( FunctionDecl * );
                 void postvisit( ObjectDecl * );
-                void postvisit( UnionDecl *aggregateDecl );
-                void postvisit( EnumDecl *aggregateDecl );
-                void postvisit( TraitDecl *aggregateDecl );
-                void postvisit( TypedefDecl *typeDecl );
-                void postvisit( TypeDecl *typeDecl );
+                void postvisit( UnionDecl * aggregateDecl );
+                void postvisit( EnumDecl * aggregateDecl );
+                void postvisit( TraitDecl * aggregateDecl );
+                void postvisit( TypedefDecl * typeDecl );
+                void postvisit( TypeDecl * typeDecl );
+                void postvisit( StaticAssertDecl * assertDecl );
 
                 //*** Initializer

src/CodeGen/OperatorTable.cc

@@ -79 +79 @@
         } // namespace
 
-        bool operatorLookup( std::string funcName, OperatorInfo &info ) {
+        bool operatorLookup( const std::string & funcName, OperatorInfo & info ) {
                 static bool init = false;
                 if ( ! init ) {
@@ -100 +100 @@
                         return true;
                 } // if
+        }
+
+        bool isOperator( const std::string & funcName ) {
+                OperatorInfo info;
+                return operatorLookup( funcName, info );
         }
 

src/CodeGen/OperatorTable.h

@@ -41 +41 @@
         };
 
-        bool operatorLookup( std::string funcName, OperatorInfo &info );
+        bool isOperator( const std::string & funcName );
+        bool operatorLookup( const std::string & funcName, OperatorInfo & info );
 
         bool isConstructor( const std::string & );