Changeset 7f3f63c

Timestamp:

May 10, 2019, 2:46:27 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

arm-eh, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

04124c4

Parents:

b96d7c1

Message:

Unions now correctly use bitfields from previous commit

Location:

src/AST

Files:

• FunctionSpec.hpp (modified) (1 diff)
• LinkageSpec.hpp (modified) (1 diff)
• StorageClasses.hpp (modified) (1 diff)

src/AST/FunctionSpec.hpp

@@ -31 +31 @@
 
         /// Bitflag type for storage classes
-        union Specs {
-                unsigned int val;
-                struct {
-                        bool is_inline   : 1;
-                        bool is_noreturn : 1;
-                        bool is_fortran  : 1;
+        struct spec_flags {
+                union {
+                        unsigned int val;
+                        struct {
+                                bool is_inline   : 1;
+                                bool is_noreturn : 1;
+                                bool is_fortran  : 1;
+                        };
+
+                        // MakeBitfieldPrint( NumSpecs )
                 };
 
-                MakeBitfield( Specs )
-                MakeBitfieldPrint( NumSpecs )
+                constexpr spec_flags( unsigned int val ) : val(val) {}
         };
 
+        using Specs = bitfield<spec_flags>;
 }
 }

src/AST/LinkageSpec.hpp

@@ -35 +35 @@
 
         /// Bitflag type for storage classes
-        union Spec {
-                unsigned int val;
-                struct {
-                        bool is_mangled      : 1;
-                        bool is_generatable  : 1;
-                        bool is_overrideable : 1;
-                        bool is_builtin      : 1;
-                        bool is_gcc_builtin  : 1;
+        struct spec_flags {
+                union {
+                        unsigned int val;
+                        struct {
+                                bool is_mangled      : 1;
+                                bool is_generatable  : 1;
+                                bool is_overrideable : 1;
+                                bool is_builtin      : 1;
+                                bool is_gcc_builtin  : 1;
+                        };
                 };
 
-                MakeBitfield( Spec )
+                constexpr spec_flags( unsigned int val ) : val(val) {}
         };
+
+        using Spec = bitfield<spec_flags>;
 
         /// If `cmd` = "C" returns `spec` with `is_mangled = false`.

src/AST/StorageClasses.hpp

@@ -33 +33 @@
 
         /// Bitflag type for storage classes
-        union Classes {
-                unsigned int val;
-                struct {
-                        bool is_extern      : 1;
-                        bool is_static      : 1;
-                        bool is_auto        : 1;
-                        bool is_register    : 1;
-                        bool is_threadlocal : 1;
+        struct class_flags {
+                union {
+                        unsigned int val;
+                        struct {
+                                bool is_extern      : 1;
+                                bool is_static      : 1;
+                                bool is_auto        : 1;
+                                bool is_register    : 1;
+                                bool is_threadlocal : 1;
+                        };
+
+                        // MakeBitfieldPrint( NumClasses )
                 };
 
-                MakeBitfield( Classes )
-                MakeBitfieldPrint( NumClasses )
+                constexpr class_flags( unsigned int val ) : val(val) {}
         };
 
+        using Classes = bitfield<class_flags>;
 }
 }