Changes in src/Parser/LinkageSpec.h [54d714e:faddbd8]

File:

• src/Parser/LinkageSpec.h (modified) (2 diffs)

src/Parser/LinkageSpec.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// LinkageSpec.h --
+// LinkageSpec.h -- 
 //
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:24:28 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Jul  7 11:03:00 2017
-// Update Count     : 13
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Oct  1 23:03:17 2016
+// Update Count     : 11
 //
 
@@ -19 +19 @@
 #include <string>
 
-namespace LinkageSpec {
-        // All linkage specs are some combination of these flags:
-        enum {
-                Mangle = 1 << 0,
-                Generate = 1 << 1,
-                Overrideable = 1 << 2,
-                Builtin = 1 << 3,
-
-                NoOfSpecs = 1 << 4,
+struct LinkageSpec {
+        enum Spec {
+                Intrinsic,                                                                              // C built-in defined in prelude
+                Cforall,                                                                                // ordinary
+                C,                                                                                              // not overloadable, not mangled
+                AutoGen,                                                                                // built by translator (struct assignment)
+                Compiler,                                                                               // gcc internal
+                NoOfSpecs
         };
-
-        union Spec {
-                unsigned int val;
-                struct {
-                        bool is_mangled : 1;
-                        bool is_generatable : 1;
-                        bool is_overridable : 1;
-                        bool is_builtin : 1;
-                };
-                constexpr Spec( unsigned int val ) : val( val ) {}
-                constexpr Spec( Spec const &other ) : val( other.val ) {}
-                // Operators may go here.
-                // Supports == and !=
-                constexpr operator unsigned int () const { return val; }
-        };
-
-
-        Spec linkageCheck( const std::string * );
-        // Returns the Spec with the given name (limited to C, Cforall & BuiltinC)
-        Spec linkageUpdate( Spec old_spec, const std::string * cmd );
-        /* If cmd = "C" returns a Spec that is old_spec with is_mangled = false
-         * If cmd = "Cforall" returns old_spec Spec with is_mangled = true
-         */
-
-        std::string linkageName( Spec );
-
-        // To Update: LinkageSpec::isXyz( cur_spec ) -> cur_spec.is_xyz
-        inline bool isMangled( Spec spec ) { return spec.is_mangled; }
-        inline bool isGeneratable( Spec spec ) { return spec.is_generatable; }
-        inline bool isOverridable( Spec spec ) { return spec.is_overridable; }
-        inline bool isBuiltin( Spec spec ) { return spec.is_builtin; }
-
-        // Pre-defined flag combinations:
-        // C built-in defined in prelude
-        constexpr Spec const Intrinsic = { Mangle | Generate | Overrideable | Builtin };
-        // ordinary
-        constexpr Spec const Cforall = { Mangle | Generate };
-        // not overloadable, not mangled
-        constexpr Spec const C = { Generate };
-        // built by translator (struct assignment)
-        constexpr Spec const AutoGen = { Mangle | Generate | Overrideable };
-        // gcc internal
-        constexpr Spec const Compiler = { Builtin };
-        // mangled builtins
-        constexpr Spec const BuiltinCFA = { Mangle | Generate | Builtin };
-        // non-mangled builtins
-        constexpr Spec const BuiltinC = { Generate | Builtin };
+  
+        static Spec linkageCheck( const std::string * );
+        static std::string linkageName( Spec );
+  
+        static bool isDecoratable( Spec );
+        static bool isGeneratable( Spec );
+        static bool isOverridable( Spec );
+        static bool isBuiltin( Spec );
 };