Changes in src/Parser/LinkageSpec.cc [d3b7937:79970ed]

File:

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

src/Parser/LinkageSpec.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// LinkageSpec.cc -- 
-// 
+// LinkageSpec.cc --
+//
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:22:09 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Aug 19 15:53:05 2015
-// Update Count     : 5
-// 
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Aug 21 12:32:53 2016
+// Update Count     : 17
+//
 
 #include <string>
@@ -20 +20 @@
 #include "Common/SemanticError.h"
 
-LinkageSpec::Type LinkageSpec::fromString( const std::string &stringSpec ) {
-        if ( stringSpec == "\"Cforall\"" ) {
+LinkageSpec::Spec LinkageSpec::fromString( const std::string &spec ) {
+        if ( spec == "\"Cforall\"" ) {
                 return Cforall;
-        } else if ( stringSpec == "\"C\"" ) {
+        } else if ( spec == "\"C\"" ) {
                 return C;
         } else {
-                throw SemanticError( "Invalid linkage specifier " + stringSpec );
-        }
+                throw SemanticError( "Invalid linkage specifier " + spec );
+        } // if
+        delete &spec;                                                                           // allocated by lexer
 }
 
-std::string LinkageSpec::toString( LinkageSpec::Type linkage ) {
-        switch ( linkage ) {
-          case Intrinsic:
-                return "intrinsic";
-          case Cforall:
-                return "Cforall";
-          case C:
-                return "C";
-          case AutoGen:
-                return "automatically generated";
-          case Compiler:
-                return "compiler built-in";
-        }
-        assert( false );
-        return "";
+std::string LinkageSpec::toString( LinkageSpec::Spec linkage ) {
+        assert( linkage >= 0 && linkage < LinkageSpec::NoOfSpecs );
+        static const char *linkageKinds[LinkageSpec::NoOfSpecs] = {
+                "intrinsic", "Cforall", "C", "automatically generated", "compiler built-in",
+        };
+        return linkageKinds[linkage];
 }
 
-bool LinkageSpec::isDecoratable( Type t ) {
-        switch ( t ) {
-          case Intrinsic:
-          case Cforall:
-          case AutoGen:
-                return true;
-          case C:
-          case Compiler:
-                return false;
-        }
-        assert( false );
-        return false;
+bool LinkageSpec::isDecoratable( Spec spec ) {
+        assert( spec >= 0 && spec < LinkageSpec::NoOfSpecs );
+        static bool decoratable[LinkageSpec::NoOfSpecs] = {
+                //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
+                        true,           true,           false,  true,           false,
+        };
+        return decoratable[spec];
 }
 
-bool LinkageSpec::isGeneratable( Type t ) {
-        switch ( t ) {
-          case Intrinsic:
-          case Cforall:
-          case AutoGen:
-          case C:
-                return true;
-          case Compiler:
-                return false;
-        }
-        assert( false );
-        return false;
+bool LinkageSpec::isGeneratable( Spec spec ) {
+        assert( spec >= 0 && spec < LinkageSpec::NoOfSpecs );
+        static bool generatable[LinkageSpec::NoOfSpecs] = {
+                //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
+                        true,           true,           true,   true,           false,
+        };
+        return generatable[spec];
 }
 
-bool LinkageSpec::isOverloadable( Type t ) {
-        return isDecoratable( t );
+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::isOverridable( Type t ) {
-        switch ( t ) {
-          case Intrinsic:
-          case AutoGen:
-                return true;
-          case Cforall:
-          case C:
-          case Compiler:
-                return false;
-        }
-        assert( false );
-        return false;
-}
-
-bool LinkageSpec::isBuiltin( Type t ) {
-        switch ( t ) {
-          case Cforall:
-          case AutoGen:
-          case C:
-                return false;
-          case Intrinsic:
-          case Compiler:
-                return true;
-        }
-        assert( false );
-        return false;
+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];
 }