Changeset 6e9ffd1

Timestamp:

Sep 13, 2018, 4:37:29 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

3271166

Parents:

a4a000d (diff), b499c18 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/Parser

Files:

• LinkageSpec.cc (modified) (2 diffs)
• LinkageSpec.h (modified) (2 diffs)

src/Parser/LinkageSpec.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:22:09 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Jul  7 11:11:00 2017
-// Update Count     : 25
+// Last Modified On : Thr Spt 12 15:59:00 2018
+// Update Count     : 26
 //
 
@@ -23 +23 @@
 
 namespace LinkageSpec {
-
-Spec linkageCheck( CodeLocation location, const string * spec ) {
-        assert( spec );
-        unique_ptr<const string> guard( spec ); // allocated by lexer
-        if ( *spec == "\"Cforall\"" ) {
-                return Cforall;
-        } else if ( *spec == "\"C\"" ) {
-                return C;
-        } else if ( *spec == "\"BuiltinC\"" ) {
-                return BuiltinC;
-        } else {
-                SemanticError( location, "Invalid linkage specifier " + *spec );
-        } // if
-}
 
 Spec linkageUpdate( CodeLocation location, Spec old_spec, const string * cmd ) {

src/Parser/LinkageSpec.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:24:28 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul  2 07:46:49 2018
-// Update Count     : 16
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr Spt 13 15:59:00 2018
+// Update Count     : 17
 //
 
@@ -41 +41 @@
 
 
-        Spec linkageCheck( CodeLocation location, const std::string * );
-        // Returns the Spec with the given name (limited to C, Cforall & BuiltinC)
         Spec linkageUpdate( CodeLocation location, Spec old_spec, const std::string * cmd );
         /* If cmd = "C" returns a Spec that is old_spec with is_mangled = false