Changeset 1fbab5a for src/CodeGen

Timestamp:

Mar 16, 2017, 4:50:08 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, resolv-new, with_gc

Children:

395fc37, 64ac636, ef42b143

Parents:

2f26687a (diff), d6d747d (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:/u/cforall/software/cfa/cfa-cc

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (3 diffs)
• FixNames.cc (modified) (3 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 : Mon Mar 13 23:56:59 2017
-// Update Count     : 477
+// Last Modified On : Thu Mar 16 09:09:09 2017
+// Update Count     : 480
 //
 
@@ -134 +134 @@
 
                 handleStorageClass( functionDecl );
-                DeclarationNode::print_FuncSpec( output, functionDecl->get_funcSpec() );
+                functionDecl->get_funcSpec().print( output );
 
                 output << genType( functionDecl->get_functionType(), mangleName( functionDecl ), pretty );
@@ -895 +895 @@
 
         void CodeGenerator::handleStorageClass( DeclarationWithType * decl ) {
-                if ( decl->get_storageClasses().val != 0 ) {
-                        DeclarationNode::print_StorageClass( output, decl->get_storageClasses() );
+                if ( decl->get_storageClasses().any() ) {
+                        decl->get_storageClasses().print( output );
                 } // if
         } // CodeGenerator::handleStorageClass

src/CodeGen/FixNames.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Mar  6 23:32:08 2017
-// Update Count     : 15
+// Last Modified On : Thu Mar 16 07:50:30 2017
+// Update Count     : 16
 //
 
@@ -39 +39 @@
         std::string mangle_main() {
                 FunctionType* main_type;
-                std::unique_ptr<FunctionDecl> mainDecl { new FunctionDecl( "main", DeclarationNode::StorageClasses(), LinkageSpec::Cforall,
+                std::unique_ptr<FunctionDecl> mainDecl { new FunctionDecl( "main", Type::StorageClasses(), LinkageSpec::Cforall,
                                                                                                                                    main_type = new FunctionType( Type::Qualifiers(), true ), nullptr )
                                 };
                 main_type->get_returnVals().push_back( 
-                        new ObjectDecl( "", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
+                        new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
                 );
 
@@ -52 +52 @@
         std::string mangle_main_args() {
                 FunctionType* main_type;
-                std::unique_ptr<FunctionDecl> mainDecl { new FunctionDecl( "main", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 
+                std::unique_ptr<FunctionDecl> mainDecl { new FunctionDecl( "main", Type::StorageClasses(), LinkageSpec::Cforall, 
                                                                                                                                    main_type = new FunctionType( Type::Qualifiers(), false ), nullptr )
                                 };
                 main_type->get_returnVals().push_back( 
-                        new ObjectDecl( "", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
+                        new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
                 );
 
                 mainDecl->get_functionType()->get_parameters().push_back( 
-                        new ObjectDecl( "", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
+                        new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
                 );
 
                 mainDecl->get_functionType()->get_parameters().push_back( 
-                        new ObjectDecl( "", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 0, 
+                        new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0, 
                         new PointerType( Type::Qualifiers(), new PointerType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::Char ) ) ), 
                         nullptr )