Changeset ab57786 for src/Parser/LinkageSpec.cc

Timestamp:

Aug 22, 2016, 2:28:47 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

2acf5fc

Parents:

80722d0

Message:

more refactoring of parser code

File:

• src/Parser/LinkageSpec.cc (modified) (3 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 : Thu Aug 18 23:47:14 2016
-// Update Count     : 12
+// Last Modified On : Sun Aug 21 12:32:53 2016
+// Update Count     : 17
 // 
 
@@ -20 +20 @@
 #include "Common/SemanticError.h"
 
-LinkageSpec::Spec 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
 }
 
@@ -37 +38 @@
 }
 
-bool LinkageSpec::isDecoratable( Spec t ) {
+bool LinkageSpec::isDecoratable( Spec spec ) {
         static bool decoratable[LinkageSpec::NoOfSpecs] = {
                 //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
                         true,           true,           false,  true,           false, 
         };
-        return decoratable[t];
+        return decoratable[spec];
 }
 
-bool LinkageSpec::isGeneratable( Spec t ) {
+bool LinkageSpec::isGeneratable( Spec spec ) {
         static bool generatable[LinkageSpec::NoOfSpecs] = {
                 //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
                         true,           true,           true,   true,           false, 
         };
-        return generatable[t];
+        return generatable[spec];
 }
 
-bool LinkageSpec::isOverloadable( Spec t ) {
-        return isDecoratable( t );
-}
-
-
-bool LinkageSpec::isOverridable( Spec t ) {
+bool LinkageSpec::isOverridable( Spec spec ) {
         static bool overridable[LinkageSpec::NoOfSpecs] = {
                 //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
                         true,           false,          false,  true,           false, 
         };
-        return overridable[t];
+        return overridable[spec];
 }
 
-bool LinkageSpec::isBuiltin( Spec t ) {
+bool LinkageSpec::isBuiltin( Spec spec ) {
         static bool builtin[LinkageSpec::NoOfSpecs] = {
                 //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
                         true,           false,          false,  false,          true, 
         };
-        return builtin[t];
+        return builtin[spec];
 }