Changeset 359f29f for src/Parser/LinkageSpec.cc

Timestamp:

Feb 15, 2018, 4:00:44 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, 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:

0b0f1dd, 24c3b67

Parents:

271326e (diff), 75e3cb2 (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

File:

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

src/Parser/LinkageSpec.cc

@@ -24 +24 @@
 namespace LinkageSpec {
 
-Spec linkageCheck( const string * spec ) {
+Spec linkageCheck( CodeLocation location, const string * spec ) {
         assert( spec );
         unique_ptr<const string> guard( spec ); // allocated by lexer
@@ -34 +34 @@
                 return BuiltinC;
         } else {
-                throw SemanticError( "Invalid linkage specifier " + *spec );
+                throw SemanticError( location, "Invalid linkage specifier " + *spec );
         } // if
 }
 
-Spec linkageUpdate( Spec old_spec, const string * cmd ) {
+Spec linkageUpdate( CodeLocation location, Spec old_spec, const string * cmd ) {
         assert( cmd );
         unique_ptr<const string> guard( cmd ); // allocated by lexer
@@ -48 +48 @@
                 return old_spec;
         } else {
-                throw SemanticError( "Invalid linkage specifier " + *cmd );
+                throw SemanticError( location, "Invalid linkage specifier " + *cmd );
         } // if
 }