Changes in src/AST/Print.cpp [835d6e8:71806e0]

File:

• src/AST/Print.cpp (modified) (11 diffs)

src/AST/Print.cpp

@@ -29 +29 @@
 namespace ast {
 
-namespace {
-
-template<typename C, typename... T>
-constexpr array<C, sizeof...(T)> make_array( T&&... values ) {
-        return array<C, sizeof...(T)>{ std::forward<T>( values )... };
-}
-
-namespace Names {
-        static constexpr auto FuncSpecifiers = make_array<const char*>(
-                "inline", "_Noreturn", "fortran"
-        );
-
-        static constexpr auto StorageClasses = make_array<const char*>(
-                "extern", "static", "auto", "register", "__thread", "_Thread_local"
-        );
-
-        static constexpr auto Qualifiers = make_array<const char*>(
-                "const", "restrict", "volatile", "mutex", "_Atomic"
-        );
-}
-
-template<typename bits_t, size_t N>
-void print( ostream & os, const bits_t & bits,
-                const array<const char *, N> & names ) {
-        if ( !bits.any() ) return;
-        for ( size_t i = 0 ; i < N ; i += 1 ) {
-                if ( bits[i] ) {
-                        os << names[i] << ' ';
-                }
-        }
+template <typename C, typename... T>
+constexpr array<C,sizeof...(T)> make_array(T&&... values)
+{
+        return array<C,sizeof...(T)>{
+                std::forward<T>(values)...
+        };
 }
 
@@ -104 +80 @@
         static const char* Names[];
 
+        struct Names {
+                static constexpr auto FuncSpecifiers = make_array<const char*>(
+                        "inline", "_Noreturn", "fortran"
+                );
+
+                static constexpr auto StorageClasses = make_array<const char*>(
+                        "extern", "static", "auto", "register", "__thread", "_Thread_local"
+                );
+
+                static constexpr auto Qualifiers = make_array<const char*>(
+                        "const", "restrict", "volatile", "mutex", "_Atomic"
+                );
+        };
+
+        template<typename storage_t, size_t N>
+        void print(const storage_t & storage, const array<const char *, N> & Names ) {
+                if ( storage.any() ) {
+                        for ( size_t i = 0; i < Names.size(); i += 1 ) {
+                                if ( storage[i] ) {
+                                        os << Names[i] << ' ';
+                                }
+                        }
+                }
+        }
+
+        void print( const ast::Function::Specs & specs ) {
+                print(specs, Names::FuncSpecifiers);
+        }
+
+        void print( const ast::Storage::Classes & storage ) {
+                print(storage, Names::StorageClasses);
+        }
+
+        void print( const ast::CV::Qualifiers & qualifiers ) {
+                print(qualifiers, Names::Qualifiers);
+        }
+
         void print( const std::vector<ast::Label> & labels ) {
                 if ( labels.empty() ) return;
@@ -217 +230 @@
                 }
 
-                ast::print( os, node->storage );
+                print( node->storage );
                 os << node->typeString();
 
@@ -259 +272 @@
 
         void preprint( const ast::Type * node ) {
-                ast::print( os, node->qualifiers );
+                print( node->qualifiers );
         }
 
@@ -265 +278 @@
                 print( node->forall );
                 print( node->assertions );
-                ast::print( os, node->qualifiers );
+                print( node->qualifiers );
         }
 
         void preprint( const ast::BaseInstType * node ) {
                 print( node->attributes );
-                ast::print( os, node->qualifiers );
+                print( node->qualifiers );
         }
 
@@ -281 +294 @@
                 }
 
-                ast::print( os, node->storage );
+                print( node->storage );
 
                 if ( node->type ) {
@@ -325 +338 @@
                 if ( ! short_mode ) printAll( node->attributes );
 
-                ast::print( os, node->storage );
-                ast::print( os, node->funcSpec );
+                print( node->storage );
+                print( node->funcSpec );
+
+
 
                 if ( node->type && node->isTypeFixed ) {
@@ -369 +384 @@
                                 --indent;
                         }
-                }
-
-                if ( ! node->withExprs.empty() ) {
-                        // Not with a clause, but the 'with clause'.
-                        ++indent;
-                        os << " with clause" << endl << indent;
-                        printAll( node->withExprs );
-                        --indent;
                 }
 
@@ -739 +746 @@
         virtual const ast::Stmt * visit( const ast::SuspendStmt * node ) override final {
                 os << "Suspend Statement";
-                switch (node->kind) {
-                case ast::SuspendStmt::None     : os << " with implicit target"; break;
-                case ast::SuspendStmt::Generator: os << " for generator"; break;
-                case ast::SuspendStmt::Coroutine: os << " for coroutine"; break;
+                switch (node->type) {
+                        case ast::SuspendStmt::None     : os << " with implicit target"; break;
+                        case ast::SuspendStmt::Generator: os << " for generator"; break;
+                        case ast::SuspendStmt::Coroutine: os << " for coroutine"; break;
                 }
                 os << endl;
@@ -1620 +1627 @@
 };
 
-} // namespace
-
 void print( ostream & os, const ast::Node * node, Indenter indent ) {
         Printer printer { os, indent, false };
@@ -1632 +1637 @@
 }
 
-void print( ostream & os, Function::Specs specs ) {
-        print( os, specs, Names::FuncSpecifiers );
+// Annoyingly these needed to be defined out of line to avoid undefined references.
+// The size here needs to be explicit but at least the compiler will produce an error
+// if the wrong size is specified
+constexpr array<const char*, 3> Printer::Names::FuncSpecifiers;
+constexpr array<const char*, 6> Printer::Names::StorageClasses;
+constexpr array<const char*, 5> Printer::Names::Qualifiers;
 }
-
-void print( ostream & os, Storage::Classes storage ) {
-        print( os, storage, Names::StorageClasses );
-}
-
-void print( ostream & os, CV::Qualifiers qualifiers ) {
-        print( os, qualifiers, Names::Qualifiers );
-}
-
-} // namespace ast