Changes in / [48ee593:795500c3]

Location:

src/AST

Files:

• LinkageSpec.cpp (modified) (1 diff)
• LinkageSpec.hpp (modified) (1 diff)

src/AST/LinkageSpec.cpp

@@ -27 +27 @@
 namespace Linkage {
 
-Spec update( CodeLocation loc, Spec spec, const std::string * cmd ) {
-        assert( cmd );
-        std::unique_ptr<const std::string> guard( cmd ); // allocated by lexer
-        if ( *cmd == "\"Cforall\"" ) {
-                spec.is_mangled = true;
-                return spec;
-        } else if ( *cmd == "\"C\"" ) {
-                spec.is_mangled = false;
-                return spec;
-        } else {
-                SemanticError( loc, "Invalid linkage specifier " + *cmd );
+        Spec update( CodeLocation loc, Spec spec, const std::string * cmd ) {
+                assert( cmd );
+                std::unique_ptr<const std::string> guard( cmd ); // allocated by lexer
+                if ( *cmd == "\"Cforall\"" ) {
+                        spec.is_mangled = true;
+                        return spec;
+                } else if ( *cmd == "\"C\"" ) {
+                        spec.is_mangled = false;
+                        return spec;
+                } else {
+                        SemanticError( loc, "Invalid linkage specifier " + *cmd );
+                }
         }
-}
 
-std::string name( Spec spec ) {
-        switch ( spec.val ) {
-        case Intrinsic.val:  return "intrinsic";
-        case C.val:          return "C";
-        case Cforall.val:    return "Cforall";
-        case AutoGen.val:    return "autogenerated cfa";
-        case Compiler.val:   return "compiler built-in";
-        case BuiltinCFA.val: return "cfa built-in";
-        case BuiltinC.val:   return "c built-in";
-        default:             return "<unnamed linkage spec>";
+
+        std::string name( Spec spec ) {
+                switch ( spec.val ) {
+                case Intrinsic.val:  return "intrinsic";
+                case C.val:          return "C";
+                case Cforall.val:    return "Cforall";
+                case AutoGen.val:    return "autogenerated cfa";
+                case Compiler.val:   return "compiler built-in";
+                case BuiltinCFA.val: return "cfa built-in";
+                case BuiltinC.val:   return "c built-in";
+                default:         return "<unnamed linkage spec>";
+                }
         }
-}
 
 }

src/AST/LinkageSpec.hpp

@@ -25 +25 @@
 namespace Linkage {
 
-/// Bitflags for linkage specifiers
-enum {
-        Mangle       = 1 << 0,
-        Generate     = 1 << 1,
-        Overrideable = 1 << 2,
-        Builtin      = 1 << 3,
-        GccBuiltin   = 1 << 4
-};
-
-/// Bitflag type for storage classes
-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;
-                };
+        /// Bitflags for linkage specifiers
+        enum {
+                Mangle       = 1 << 0,
+                Generate     = 1 << 1,
+                Overrideable = 1 << 2,
+                Builtin      = 1 << 3,
+                GccBuiltin   = 1 << 4
         };
 
-        constexpr spec_flags( unsigned int val ) : val(val) {}
-};
+        /// Bitflag type for storage classes
+        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;
+                        };
+                };
 
-using Spec = bitfield<spec_flags>;
+                constexpr spec_flags( unsigned int val ) : val(val) {}
+        };
 
-/// If `cmd` = "C" returns `spec` with `is_mangled = false`.
-/// If `cmd` = "Cforall" returns `spec` with `is_mangled = true`.
-Spec update( CodeLocation loc, Spec spec, const std::string * cmd );
+        using Spec = bitfield<spec_flags>;
 
-/// A human-readable name for this spec
-std::string name( Spec spec );
+        /// If `cmd` = "C" returns `spec` with `is_mangled = false`.
+        /// If `cmd` = "Cforall" returns `spec` with `is_mangled = true`.
+        Spec update( CodeLocation loc, Spec spec, const std::string * cmd );
 
-// Pre-defined flag combinations
+        /// A human-readable name for this spec
+        std::string name( Spec spec );
 
-/// C built-in defined in prelude
-constexpr Spec Intrinsic  = { Mangle | Generate | Overrideable | Builtin };
-/// Ordinary Cforall
-constexpr Spec Cforall    = { Mangle | Generate };
-/// C code: not overloadable, not mangled
-constexpr Spec C          = { Generate };
-/// Built by translator (e.g. struct assignment)
-constexpr Spec AutoGen    = { Mangle | Generate | Overrideable };
-/// GCC internal
-constexpr Spec Compiler   = { Mangle | Builtin | GccBuiltin };
-/// Mangled builtins
-constexpr Spec BuiltinCFA = { Mangle | Generate | Builtin };
-/// Non-mangled builtins
-constexpr Spec BuiltinC   = { Generate | Builtin };
+        // Pre-defined flag combinations
 
+        /// C built-in defined in prelude
+        constexpr Spec Intrinsic  = { Mangle | Generate | Overrideable | Builtin };
+        /// Ordinary Cforall
+        constexpr Spec Cforall    = { Mangle | Generate };
+        /// C code: not overloadable, not mangled
+        constexpr Spec C          = { Generate };
+        /// Built by translator (e.g. struct assignment)
+        constexpr Spec AutoGen    = { Mangle | Generate | Overrideable };
+        /// GCC internal
+        constexpr Spec Compiler   = { Mangle | Builtin | GccBuiltin };
+        /// Mangled builtins
+        constexpr Spec BuiltinCFA = { Mangle | Generate | Builtin };
+        /// Non-mangled builtins
+        constexpr Spec BuiltinC   = { Generate | Builtin };
 }