Changeset b5b0907 for src/CodeGen

Timestamp:

Jun 15, 2015, 12:45:26 PM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

94b4364

Parents:

ea9b9d3 (diff), a1d5d2a (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 resolver

Conflicts:

src/CodeGen/CodeGenerator.cc

File:

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

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu Jun 11 13:22:39 2015
-// Update Count     : 137
+// Last Modified On : Mon Jun 15 12:43:21 2015
+// Update Count     : 138
 //
 
@@ -19 +19 @@
 #include <list>
 
+#include "Parser/ParseNode.h"
+
 #include "SynTree/Type.h"
-#include "SynTree/Declaration.h"
-#include "SynTree/Statement.h"
 #include "SynTree/Expression.h"
 #include "SynTree/Initializer.h"
+#include "SynTree/Statement.h"
 
 #include "utility.h"
@@ -628 +629 @@
         void CodeGenerator::handleStorageClass( Declaration *decl ) {
                 switch ( decl->get_storageClass() ) {
-                  case Declaration::NoStorageClass:
-                        break;
-                  case Declaration::Extern:
+                  case DeclarationNode::Extern:
                         output << "extern ";
                         break;
-                  case Declaration::Static:
+                  case DeclarationNode::Static:
                         output << "static ";
                         break;
-                  case Declaration::Auto:
+                  case DeclarationNode::Auto:
                         // silently drop storage class
                         break;
-                  case Declaration::Register:
+                  case DeclarationNode::Register:
                         output << "register ";
                         break;
-                  case Declaration::Inline:
+                  case DeclarationNode::Inline:
                         // handled as special via isInline flag (FIX)
                         break;
-                  case Declaration::Fortran:
+                  case DeclarationNode::Fortran:
                         // not handled
+                        output << "fortran ";
+                        break;
+                  case DeclarationNode::Noreturn:
+                        // not handled
+                        output << "_Noreturn ";
+                        break;
+                  case DeclarationNode::Threadlocal:
+                        // not handled
+                        output << "_Thread_local ";
+                        break;
+                  case DeclarationNode::NoStorageClass:
                         break;
                 } // switch