commit a5fb5854212df122b0f65e7ecf3c80d8b4ba30ce
author River Riddle <riverriddle@google.com> Sat Feb 02 00:07:30 2019 -0800
committer jpienaar <jpienaar@google.com> Fri Mar 29 16:07:40 2019 -0700
tree f8fffbf69ea406710286eb7a4a4a17e9d04c1809
parent 5b9887d423e4dde85185a975b83ef2ee16900d08

Emit an error when parsing an affine structure if '->' or ':' is not found
after the dim/symbol id list.

PiperOrigin-RevId: 232094789

lib/Parser/Parser.cpp

diff --git a/lib/Parser/Parser.cpp b/lib/Parser/Parser.cpp
index a9c6276..44587cb 100644
--- a/lib/Parser/Parser.cpp
+++ b/lib/Parser/Parser.cpp
@@ -1943,7 +1943,7 @@
   bool isArrow = getToken().is(Token::arrow);
   bool isColon = getToken().is(Token::colon);
   if (!isArrow && !isColon) {
-    return ParseFailure;
+    return emitError("expected '->' or ':'");
   } else if (isArrow) {
     parseToken(Token::arrow, "expected '->' or '['");
     map = parseAffineMapRange(numDims, numSymbols);

test/IR/invalid.mlir

diff --git a/test/IR/invalid.mlir b/test/IR/invalid.mlir
index e41f88c..110b374 100644
--- a/test/IR/invalid.mlir
+++ b/test/IR/invalid.mlir
@@ -803,3 +803,11 @@
 // -----
 
 #set_without_constraints = (i, j) : () // expected-error {{expected a valid affine constraint}}
+
+// -----
+
+func @invalid_affine_structure() {
+  %c0 = constant 0 : index
+  %idx = affine_apply (d0, d1) (%c0, %c0) // expected-error {{expected '->' or ':'}}
+  return
+}