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

File:

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

src/Parser/LinkageSpec.cc

@@ -10 +10 @@
 // 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 On : Sun Aug 21 12:32:53 2016
+// Update Count     : 17
 //
 
@@ -17 +17 @@
 #include <string>
 #include <cassert>
-using namespace std;
 
 #include "LinkageSpec.h"
 #include "Common/SemanticError.h"
 
-LinkageSpec::Spec LinkageSpec::linkageCheck( const string * spec ) {
-        unique_ptr<const string> guard( spec ); // allocated by lexer
-        if ( *spec == "\"Cforall\"" ) {
+LinkageSpec::Spec LinkageSpec::fromString( const std::string &spec ) {
+        std::unique_ptr<const std::string> guard(&spec);                // allocated by lexer
+        if ( spec == "\"Cforall\"" ) {
                 return Cforall;
-        } else if ( *spec == "\"C\"" ) {
+        } else if ( spec == "\"C\"" ) {
                 return C;
         } else {
-                throw SemanticError( "Invalid linkage specifier " + *spec );
+                throw SemanticError( "Invalid linkage specifier " + spec );
         } // if
 }
 
-string LinkageSpec::linkageName( LinkageSpec::Spec linkage ) {
-        assert( 0 <= linkage && linkage < LinkageSpec::NoOfSpecs );
+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",
@@ -42 +41 @@
 
 bool LinkageSpec::isDecoratable( Spec spec ) {
-        assert( 0 <= spec && spec < LinkageSpec::NoOfSpecs );
+        assert( spec >= 0 && spec < LinkageSpec::NoOfSpecs );
         static bool decoratable[LinkageSpec::NoOfSpecs] = {
                 //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
@@ -51 +50 @@
 
 bool LinkageSpec::isGeneratable( Spec spec ) {
-        assert( 0 <= spec && spec < LinkageSpec::NoOfSpecs );
+        assert( spec >= 0 && spec < LinkageSpec::NoOfSpecs );
         static bool generatable[LinkageSpec::NoOfSpecs] = {
                 //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler