Changeset 04cdd9b for src/Parser/LinkageSpec.cc

Timestamp:

Aug 19, 2016, 2:42:04 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

e85a8631

Parents:

03da511 (diff), ac71a86 (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' into ctor

File:

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

src/Parser/LinkageSpec.cc

@@ -9 +9 @@
 // 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 : Thu Aug 18 23:47:14 2016
+// Update Count     : 12
 // 
 
@@ -20 +20 @@
 #include "Common/SemanticError.h"
 
-LinkageSpec::Type LinkageSpec::fromString( const std::string &stringSpec ) {
+LinkageSpec::Spec LinkageSpec::fromString( const std::string &stringSpec ) {
         if ( stringSpec == "\"Cforall\"" ) {
                 return Cforall;
@@ -30 +30 @@
 }
 
-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 ) {
+        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 t ) {
+        static bool decoratable[LinkageSpec::NoOfSpecs] = {
+                //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
+                        true,           true,           false,  true,           false, 
+        };
+        return decoratable[t];
 }
 
-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 t ) {
+        static bool generatable[LinkageSpec::NoOfSpecs] = {
+                //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
+                        true,           true,           true,   true,           false, 
+        };
+        return generatable[t];
 }
 
-bool LinkageSpec::isOverloadable( Type t ) {
+bool LinkageSpec::isOverloadable( Spec t ) {
         return isDecoratable( t );
 }
 
 
-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::isOverridable( Spec t ) {
+        static bool overridable[LinkageSpec::NoOfSpecs] = {
+                //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
+                        true,           false,          false,  true,           false, 
+        };
+        return overridable[t];
 }
 
-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 t ) {
+        static bool builtin[LinkageSpec::NoOfSpecs] = {
+                //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
+                        true,           false,          false,  false,          true, 
+        };
+        return builtin[t];
 }