Changeset 359f29f for src/Parser/parser.yy

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/parser.yy (modified) (4 diffs)

src/Parser/parser.yy

@@ -482 +482 @@
                 { $$ = new ExpressionNode( new StmtExpr( dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >($2) ) ) ); }
         | type_name '.' no_attr_identifier                                      // CFA, nested type
-                { throw SemanticError("Qualified names are currently unimplemented."); $$ = nullptr; } // FIX ME
+                { throw SemanticError(yylloc, "Qualified names are currently unimplemented."); $$ = nullptr; } // FIX ME
         | type_name '.' '[' push field_list pop ']'                     // CFA, nested type / tuple field selector
-                { throw SemanticError("Qualified names are currently unimplemented."); $$ = nullptr; } // FIX ME
+                { throw SemanticError(yylloc, "Qualified names are currently unimplemented."); $$ = nullptr; } // FIX ME
         ;
 
@@ -1072 +1072 @@
 mutex_statement:
         MUTEX '(' argument_expression_list ')' statement
-                { throw SemanticError("Mutex statement is currently unimplemented."); $$ = nullptr; } // FIX ME
+                { throw SemanticError(yylloc, "Mutex statement is currently unimplemented."); $$ = nullptr; } // FIX ME
         ;
 
@@ -1293 +1293 @@
 static_assert:
         STATICASSERT '(' constant_expression ',' string_literal ')' ';' // C11
-                { throw SemanticError("Static assert is currently unimplemented."); $$ = nullptr; }     // FIX ME
+                { throw SemanticError(yylloc, "Static assert is currently unimplemented."); $$ = nullptr; }     // FIX ME
 
 // C declaration syntax is notoriously confusing and error prone. Cforall provides its own type, variable and function
@@ -2381 +2381 @@
                 {
                         linkageStack.push( linkage );                           // handle nested extern "C"/"Cforall"
-                        linkage = LinkageSpec::linkageUpdate( linkage, $2 );
+                        linkage = LinkageSpec::linkageUpdate( yylloc, linkage, $2 );
                 }
           '{' external_definition_list_opt '}'