Changeset 90152a4 for src/Parser/LinkageSpec.cc

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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 cleanup-dtors

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 );
+                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 );
+                SemanticError( location, "Invalid linkage specifier " + *cmd );
         } // if
 }