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

File:

• src/Parser/LinkageSpec.cc (modified) (4 diffs)

src/Parser/LinkageSpec.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:22:09 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Oct  2 23:16:21 2016
-// Update Count     : 23
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Jul  7 11:11:00 2017
+// Update Count     : 25
 //
 
@@ -22 +22 @@
 #include "Common/SemanticError.h"
 
-LinkageSpec::Spec LinkageSpec::linkageCheck( const string * spec ) {
+namespace LinkageSpec {
+
+Spec linkageCheck( const string * spec ) {
+        assert( spec );
         unique_ptr<const string> guard( spec ); // allocated by lexer
         if ( *spec == "\"Cforall\"" ) {
@@ -28 +31 @@
         } else if ( *spec == "\"C\"" ) {
                 return C;
+        } else if ( *spec == "\"BuiltinC\"" ) {
+                return BuiltinC;
         } else {
                 throw SemanticError( "Invalid linkage specifier " + *spec );
@@ -33 +38 @@
 }
 
-string LinkageSpec::linkageName( LinkageSpec::Spec linkage ) {
-        assert( 0 <= linkage && linkage < LinkageSpec::NoOfSpecs );
-        static const char *linkageKinds[LinkageSpec::NoOfSpecs] = {
-                "intrinsic", "Cforall", "C", "automatically generated", "compiler built-in",
-        };
-        return linkageKinds[linkage];
+Spec linkageUpdate( Spec old_spec, const string * cmd ) {
+        assert( cmd );
+        unique_ptr<const string> guard( cmd ); // allocated by lexer
+        if ( *cmd == "\"Cforall\"" ) {
+                old_spec.is_mangled = true;
+                return old_spec;
+        } else if ( *cmd == "\"C\"" ) {
+                old_spec.is_mangled = false;
+                return old_spec;
+        } else {
+                throw SemanticError( "Invalid linkage specifier " + *cmd );
+        } // if
 }
 
-bool LinkageSpec::isDecoratable( Spec spec ) {
-        assert( 0 <= spec && spec < LinkageSpec::NoOfSpecs );
-        static bool decoratable[LinkageSpec::NoOfSpecs] = {
-                //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
-                        true,           true,           false,  true,           false,
-        };
-        return decoratable[spec];
+std::string linkageName( Spec linkage ) {
+    switch ( linkage ) {
+    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>";
+    }
 }
 
-bool LinkageSpec::isGeneratable( Spec spec ) {
-        assert( 0 <= spec && spec < LinkageSpec::NoOfSpecs );
-        static bool generatable[LinkageSpec::NoOfSpecs] = {
-                //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
-                        true,           true,           true,   true,           false,
-        };
-        return generatable[spec];
-}
-
-bool LinkageSpec::isOverridable( Spec spec ) {
-        assert( spec >= 0 && spec < LinkageSpec::NoOfSpecs );
-        static bool overridable[LinkageSpec::NoOfSpecs] = {
-                //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
-                        true,           false,          false,  true,           false,
-        };
-        return overridable[spec];
-}
-
-bool LinkageSpec::isBuiltin( Spec spec ) {
-        assert( spec >= 0 && spec < LinkageSpec::NoOfSpecs );
-        static bool builtin[LinkageSpec::NoOfSpecs] = {
-                //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
-                        true,           false,          false,  false,          true,
-        };
-        return builtin[spec];
-}
+} // LinkageSpec
 
 // Local Variables: //