Changeset 257a8f5

Timestamp:

Feb 22, 2023, 5:47:11 PM (21 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

aca0d2f

Parents:

640b3df

Message:

Made some of the AST/Print helpers public.

Location:

src/AST

Files:

• Fwd.hpp (modified) (2 diffs)
• Print.cpp (modified) (9 diffs)
• Print.hpp (modified) (2 diffs)

src/AST/Fwd.hpp

@@ -15 +15 @@
 
 #pragma once
+
+template<typename> struct bitfield;
 
 #include "AST/Node.hpp"
@@ -147 +149 @@
 class TranslationGlobal;
 
+// For the following types, only use the using type.
+namespace CV {
+        struct qualifier_flags;
+        using Qualifiers = bitfield<qualifier_flags>;
 }
+namespace Function {
+        struct spec_flags;
+        using Specs = bitfield<spec_flags>;
+}
+namespace Storage {
+        struct class_flags;
+        using Classes = bitfield<class_flags>;
+}
+namespace Linkage {
+        struct spec_flags;
+        using Spec = bitfield<spec_flags>;
+}
+
+}

src/AST/Print.cpp

@@ -29 +29 @@
 namespace ast {
 
-template <typename C, typename... T>
-constexpr array<C,sizeof...(T)> make_array(T&&... values)
-{
-        return array<C,sizeof...(T)>{
-                std::forward<T>(values)...
-        };
+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] << ' ';
+                }
+        }
 }
 
@@ -80 +104 @@
         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;
@@ -230 +217 @@
                 }
 
-                print( node->storage );
+                ast::print( os, node->storage );
                 os << node->typeString();
 
@@ -272 +259 @@
 
         void preprint( const ast::Type * node ) {
-                print( node->qualifiers );
+                ast::print( os, node->qualifiers );
         }
 
@@ -278 +265 @@
                 print( node->forall );
                 print( node->assertions );
-                print( node->qualifiers );
+                ast::print( os, node->qualifiers );
         }
 
         void preprint( const ast::BaseInstType * node ) {
                 print( node->attributes );
-                print( node->qualifiers );
+                ast::print( os, node->qualifiers );
         }
 
@@ -294 +281 @@
                 }
 
-                print( node->storage );
+                ast::print( os, node->storage );
 
                 if ( node->type ) {
@@ -338 +325 @@
                 if ( ! short_mode ) printAll( node->attributes );
 
-                print( node->storage );
-                print( node->funcSpec );
-
-
+                ast::print( os, node->storage );
+                ast::print( os, node->funcSpec );
 
                 if ( node->type && node->isTypeFixed ) {
@@ -1627 +1612 @@
 };
 
+} // namespace
+
 void print( ostream & os, const ast::Node * node, Indenter indent ) {
         Printer printer { os, indent, false };
@@ -1637 +1624 @@
 }
 
-// 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, Function::Specs specs ) {
+        print( os, specs, Names::FuncSpecifiers );
 }
+
+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

src/AST/Print.hpp

@@ -16 +16 @@
 #pragma once
 
-#include <iostream>
-#include <utility>   // for forward
+#include <iosfwd>
 
-#include "AST/Node.hpp"
+#include "AST/Fwd.hpp"
 #include "Common/Indenter.h"
 
 namespace ast {
-
-class Decl;
 
 /// Print a node with the given indenter
@@ -44 +41 @@
 }
 
+/// Print each cv-qualifier used in the set, followed by a space.
+void print( std::ostream & os, CV::Qualifiers );
+/// Print each function specifier used in the set, followed by a space.
+void print( std::ostream & os, Function::Specs );
+/// Print each storage class used in the set, followed by a space.
+void print( std::ostream & os, Storage::Classes );
+
 }