Changeset 36354b1 for src/AST/LinkageSpec.cpp

Timestamp:

May 10, 2019, 12:09:05 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

9131e54, cdcd53dc

Parents:

292d599 (diff), 14cebb7a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/AST/LinkageSpec.cpp (modified) (1 diff)

src/AST/LinkageSpec.cpp

@@ -24 +24 @@
 
 namespace ast {
-        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 );
-                        }
+
+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 );
                 }
-        
+        }
 
-                std::string name( Spec spec ) {
-                        switch ( spec ) {
-                        case Intrinsic:  return "intrinsic";
-                        case C:          return "C";
-                        case Cforall:    return "Cforall";
-                        case AutoGen:    return "autogenerated cfa";
-                        case Compiler:   return "compiler built-in";
-                        case BuiltinCFA: return "cfa built-in";
-                        case BuiltinC:   return "c built-in";
-                        default:         return "<unnamed linkage spec>";
-                        }
+
+        std::string name( Spec spec ) {
+                switch ( spec ) {
+                case Intrinsic:  return "intrinsic";
+                case C:          return "C";
+                case Cforall:    return "Cforall";
+                case AutoGen:    return "autogenerated cfa";
+                case Compiler:   return "compiler built-in";
+                case BuiltinCFA: return "cfa built-in";
+                case BuiltinC:   return "c built-in";
+                default:         return "<unnamed linkage spec>";
                 }
+        }
 
-        }
+}
+
 }