Commit cb530ec8 authored by Matthias Kramm's avatar Matthias Kramm Committed by River Riddle
Browse files

[mlir][Tutorial] Make parsing an empty file print a better error. 

Summary:
Previously, we would, for an empty file, print the somewhat confusing
  Assertion `tok == curTok [...]' failed.
With this change, we now print
  Parse error [...]: expected 'def' [...]

This only affects the parser from chapters 1-6, since the more advanced
chapter 7 parser is actually able to generate an empty module from an
empty file.  Nonetheless, this commit also adds the additional check to
the chapter 7 parser, for consistency.

Differential Revision: https://reviews.llvm.org/D75534
parent c1089668

mlir/examples/toy/Ch1/include/toy/Parser.h

+4 −0
Original line number Diff line number Diff line
@@ -396,7 +396,11 @@ private: 
  /// decl_list ::= identifier | identifier, decl_list

  std::unique_ptr<PrototypeAST> parsePrototype() {

    auto loc = lexer.getLastLocation();



    if (lexer.getCurToken() != tok_def)

      return parseError<PrototypeAST>("def", "in prototype");

    lexer.consume(tok_def);



    if (lexer.getCurToken() != tok_identifier)

      return parseError<PrototypeAST>("function name", "in prototype");

mlir/examples/toy/Ch2/include/toy/Parser.h

+4 −0
Original line number Diff line number Diff line
@@ -396,7 +396,11 @@ private: 
  /// decl_list ::= identifier | identifier, decl_list

  std::unique_ptr<PrototypeAST> parsePrototype() {

    auto loc = lexer.getLastLocation();



    if (lexer.getCurToken() != tok_def)

      return parseError<PrototypeAST>("def", "in prototype");

    lexer.consume(tok_def);



    if (lexer.getCurToken() != tok_identifier)

      return parseError<PrototypeAST>("function name", "in prototype");

mlir/examples/toy/Ch3/include/toy/Parser.h

+4 −0
Original line number Diff line number Diff line
@@ -396,7 +396,11 @@ private: 
  /// decl_list ::= identifier | identifier, decl_list

  std::unique_ptr<PrototypeAST> parsePrototype() {

    auto loc = lexer.getLastLocation();



    if (lexer.getCurToken() != tok_def)

      return parseError<PrototypeAST>("def", "in prototype");

    lexer.consume(tok_def);



    if (lexer.getCurToken() != tok_identifier)

      return parseError<PrototypeAST>("function name", "in prototype");

mlir/examples/toy/Ch4/include/toy/Parser.h

+4 −0
Original line number Diff line number Diff line
@@ -396,7 +396,11 @@ private: 
  /// decl_list ::= identifier | identifier, decl_list

  std::unique_ptr<PrototypeAST> parsePrototype() {

    auto loc = lexer.getLastLocation();



    if (lexer.getCurToken() != tok_def)

      return parseError<PrototypeAST>("def", "in prototype");

    lexer.consume(tok_def);



    if (lexer.getCurToken() != tok_identifier)

      return parseError<PrototypeAST>("function name", "in prototype");

mlir/examples/toy/Ch5/include/toy/Parser.h

+4 −0
Original line number Diff line number Diff line
@@ -396,7 +396,11 @@ private: 
  /// decl_list ::= identifier | identifier, decl_list

  std::unique_ptr<PrototypeAST> parsePrototype() {

    auto loc = lexer.getLastLocation();



    if (lexer.getCurToken() != tok_def)

      return parseError<PrototypeAST>("def", "in prototype");

    lexer.consume(tok_def);



    if (lexer.getCurToken() != tok_identifier)

      return parseError<PrototypeAST>("function name", "in prototype");