This is an archive of the discontinued LLVM Phabricator instance.

Differential D75534

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

Authored by matthiaskramm on Mar 3 2020, 8:34 AM.

Details

Reviewers
rriddle
Commits
rGcb530ec8b841: [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.

Diff Detail

Event Timeline

matthiaskramm created this revision.Mar 3 2020, 8:34 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 3 2020, 8:34 AM
Herald added subscribers: llvm-commits, Joonsoo, liufengdb and 9 others. · View Herald Transcript
Harbormaster completed remote builds in B47917: Diff 247916.Mar 3 2020, 8:53 AM
rriddle accepted this revision.Mar 3 2020, 1:15 PM
This revision is now accepted and ready to land.Mar 3 2020, 1:15 PM
Closed by commit rGcb530ec8b841: [mlir][Tutorial] Make parsing an empty file print a better error. (authored by matthiaskramm, committed by rriddle). · Explain WhyMar 3 2020, 1:48 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
mlir/
examples/
toy/
Ch1/
include/
toy/
4 lines
Ch2/
include/
toy/
4 lines
Ch3/
include/
toy/
4 lines
Ch4/
include/
toy/
4 lines
Ch5/
include/
toy/
4 lines
Ch6/
include/
toy/
4 lines
Ch7/
include/
toy/
4 lines
test/
Examples/
Toy/
Ch1/
3 lines
Ch2/
3 lines
Ch3/
3 lines
Ch4/
3 lines
Ch5/
3 lines
Ch6/
3 lines
Ch7/
4 lines

Diff 248018

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

Show First 20 Lines • Show All 390 Lines • ▼ Show 20 Lines std::unique_ptr<ExprASTList> parseBlock() {
lexer.consume(Token('}')); lexer.consume(Token('}'));
return exprList; return exprList;
} }
/// prototype ::= def id '(' decl_list ')' /// prototype ::= def id '(' decl_list ')'
/// decl_list ::= identifier | identifier, decl_list /// decl_list ::= identifier | identifier, decl_list
std::unique_ptr<PrototypeAST> parsePrototype() { std::unique_ptr<PrototypeAST> parsePrototype() {
auto loc = lexer.getLastLocation(); auto loc = lexer.getLastLocation();
if (lexer.getCurToken() != tok_def)
return parseError<PrototypeAST>("def", "in prototype");
lexer.consume(tok_def); lexer.consume(tok_def);
if (lexer.getCurToken() != tok_identifier) if (lexer.getCurToken() != tok_identifier)
return parseError<PrototypeAST>("function name", "in prototype"); return parseError<PrototypeAST>("function name", "in prototype");
std::string fnName(lexer.getId()); std::string fnName(lexer.getId());
lexer.consume(tok_identifier); lexer.consume(tok_identifier);
if (lexer.getCurToken() != '(') if (lexer.getCurToken() != '(')
return parseError<PrototypeAST>("(", "in prototype"); return parseError<PrototypeAST>("(", "in prototype");
▲ Show 20 Lines • Show All 78 Lines • Show Last 20 Lines

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

Show First 20 Lines • Show All 390 Lines • ▼ Show 20 Lines std::unique_ptr<ExprASTList> parseBlock() {
lexer.consume(Token('}')); lexer.consume(Token('}'));
return exprList; return exprList;
} }
/// prototype ::= def id '(' decl_list ')' /// prototype ::= def id '(' decl_list ')'
/// decl_list ::= identifier | identifier, decl_list /// decl_list ::= identifier | identifier, decl_list
std::unique_ptr<PrototypeAST> parsePrototype() { std::unique_ptr<PrototypeAST> parsePrototype() {
auto loc = lexer.getLastLocation(); auto loc = lexer.getLastLocation();
if (lexer.getCurToken() != tok_def)
return parseError<PrototypeAST>("def", "in prototype");
lexer.consume(tok_def); lexer.consume(tok_def);
if (lexer.getCurToken() != tok_identifier) if (lexer.getCurToken() != tok_identifier)
return parseError<PrototypeAST>("function name", "in prototype"); return parseError<PrototypeAST>("function name", "in prototype");
std::string fnName(lexer.getId()); std::string fnName(lexer.getId());
lexer.consume(tok_identifier); lexer.consume(tok_identifier);
if (lexer.getCurToken() != '(') if (lexer.getCurToken() != '(')
return parseError<PrototypeAST>("(", "in prototype"); return parseError<PrototypeAST>("(", "in prototype");
▲ Show 20 Lines • Show All 78 Lines • Show Last 20 Lines

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

Show First 20 Lines • Show All 390 Lines • ▼ Show 20 Lines std::unique_ptr<ExprASTList> parseBlock() {
lexer.consume(Token('}')); lexer.consume(Token('}'));
return exprList; return exprList;
} }
/// prototype ::= def id '(' decl_list ')' /// prototype ::= def id '(' decl_list ')'
/// decl_list ::= identifier | identifier, decl_list /// decl_list ::= identifier | identifier, decl_list
std::unique_ptr<PrototypeAST> parsePrototype() { std::unique_ptr<PrototypeAST> parsePrototype() {
auto loc = lexer.getLastLocation(); auto loc = lexer.getLastLocation();
if (lexer.getCurToken() != tok_def)
return parseError<PrototypeAST>("def", "in prototype");
lexer.consume(tok_def); lexer.consume(tok_def);
if (lexer.getCurToken() != tok_identifier) if (lexer.getCurToken() != tok_identifier)
return parseError<PrototypeAST>("function name", "in prototype"); return parseError<PrototypeAST>("function name", "in prototype");
std::string fnName(lexer.getId()); std::string fnName(lexer.getId());
lexer.consume(tok_identifier); lexer.consume(tok_identifier);
if (lexer.getCurToken() != '(') if (lexer.getCurToken() != '(')
return parseError<PrototypeAST>("(", "in prototype"); return parseError<PrototypeAST>("(", "in prototype");
▲ Show 20 Lines • Show All 78 Lines • Show Last 20 Lines

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

Show First 20 Lines • Show All 390 Lines • ▼ Show 20 Lines std::unique_ptr<ExprASTList> parseBlock() {
lexer.consume(Token('}')); lexer.consume(Token('}'));
return exprList; return exprList;
} }
/// prototype ::= def id '(' decl_list ')' /// prototype ::= def id '(' decl_list ')'
/// decl_list ::= identifier | identifier, decl_list /// decl_list ::= identifier | identifier, decl_list
std::unique_ptr<PrototypeAST> parsePrototype() { std::unique_ptr<PrototypeAST> parsePrototype() {
auto loc = lexer.getLastLocation(); auto loc = lexer.getLastLocation();
if (lexer.getCurToken() != tok_def)
return parseError<PrototypeAST>("def", "in prototype");
lexer.consume(tok_def); lexer.consume(tok_def);
if (lexer.getCurToken() != tok_identifier) if (lexer.getCurToken() != tok_identifier)
return parseError<PrototypeAST>("function name", "in prototype"); return parseError<PrototypeAST>("function name", "in prototype");
std::string fnName(lexer.getId()); std::string fnName(lexer.getId());
lexer.consume(tok_identifier); lexer.consume(tok_identifier);
if (lexer.getCurToken() != '(') if (lexer.getCurToken() != '(')
return parseError<PrototypeAST>("(", "in prototype"); return parseError<PrototypeAST>("(", "in prototype");
▲ Show 20 Lines • Show All 78 Lines • Show Last 20 Lines

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

Show First 20 Lines • Show All 390 Lines • ▼ Show 20 Lines std::unique_ptr<ExprASTList> parseBlock() {
lexer.consume(Token('}')); lexer.consume(Token('}'));
return exprList; return exprList;
} }
/// prototype ::= def id '(' decl_list ')' /// prototype ::= def id '(' decl_list ')'
/// decl_list ::= identifier | identifier, decl_list /// decl_list ::= identifier | identifier, decl_list
std::unique_ptr<PrototypeAST> parsePrototype() { std::unique_ptr<PrototypeAST> parsePrototype() {
auto loc = lexer.getLastLocation(); auto loc = lexer.getLastLocation();
if (lexer.getCurToken() != tok_def)
return parseError<PrototypeAST>("def", "in prototype");
lexer.consume(tok_def); lexer.consume(tok_def);
if (lexer.getCurToken() != tok_identifier) if (lexer.getCurToken() != tok_identifier)
return parseError<PrototypeAST>("function name", "in prototype"); return parseError<PrototypeAST>("function name", "in prototype");
std::string fnName(lexer.getId()); std::string fnName(lexer.getId());
lexer.consume(tok_identifier); lexer.consume(tok_identifier);
if (lexer.getCurToken() != '(') if (lexer.getCurToken() != '(')
return parseError<PrototypeAST>("(", "in prototype"); return parseError<PrototypeAST>("(", "in prototype");
▲ Show 20 Lines • Show All 78 Lines • Show Last 20 Lines

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

Show First 20 Lines • Show All 390 Lines • ▼ Show 20 Lines std::unique_ptr<ExprASTList> parseBlock() {
lexer.consume(Token('}')); lexer.consume(Token('}'));
return exprList; return exprList;
} }
/// prototype ::= def id '(' decl_list ')' /// prototype ::= def id '(' decl_list ')'
/// decl_list ::= identifier | identifier, decl_list /// decl_list ::= identifier | identifier, decl_list
std::unique_ptr<PrototypeAST> parsePrototype() { std::unique_ptr<PrototypeAST> parsePrototype() {
auto loc = lexer.getLastLocation(); auto loc = lexer.getLastLocation();
if (lexer.getCurToken() != tok_def)
return parseError<PrototypeAST>("def", "in prototype");
lexer.consume(tok_def); lexer.consume(tok_def);
if (lexer.getCurToken() != tok_identifier) if (lexer.getCurToken() != tok_identifier)
return parseError<PrototypeAST>("function name", "in prototype"); return parseError<PrototypeAST>("function name", "in prototype");
std::string fnName(lexer.getId()); std::string fnName(lexer.getId());
lexer.consume(tok_identifier); lexer.consume(tok_identifier);
if (lexer.getCurToken() != '(') if (lexer.getCurToken() != '(')
return parseError<PrototypeAST>("(", "in prototype"); return parseError<PrototypeAST>("(", "in prototype");
▲ Show 20 Lines • Show All 78 Lines • Show Last 20 Lines

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

Show First 20 Lines • Show All 528 Lines • ▼ Show 20 Lines std::unique_ptr<ExprASTList> parseBlock() {
lexer.consume(Token('}')); lexer.consume(Token('}'));
return exprList; return exprList;
} }
/// prototype ::= def id '(' decl_list ')' /// prototype ::= def id '(' decl_list ')'
/// decl_list ::= identifier | identifier, decl_list /// decl_list ::= identifier | identifier, decl_list
std::unique_ptr<PrototypeAST> parsePrototype() { std::unique_ptr<PrototypeAST> parsePrototype() {
auto loc = lexer.getLastLocation(); auto loc = lexer.getLastLocation();
if (lexer.getCurToken() != tok_def)
return parseError<PrototypeAST>("def", "in prototype");
lexer.consume(tok_def); lexer.consume(tok_def);
if (lexer.getCurToken() != tok_identifier) if (lexer.getCurToken() != tok_identifier)
return parseError<PrototypeAST>("function name", "in prototype"); return parseError<PrototypeAST>("function name", "in prototype");
std::string fnName(lexer.getId()); std::string fnName(lexer.getId());
lexer.consume(tok_identifier); lexer.consume(tok_identifier);
if (lexer.getCurToken() != '(') if (lexer.getCurToken() != '(')
return parseError<PrototypeAST>("(", "in prototype"); return parseError<PrototypeAST>("(", "in prototype");
▲ Show 20 Lines • Show All 134 Lines • Show Last 20 Lines

mlir/test/Examples/Toy/Ch1/empty.toy

  • This file was added.
# RUN: toyc-ch1 %s -emit=ast 2>&1 | FileCheck %s
# CHECK-NOT: Assert
# CHECK: Parse error

mlir/test/Examples/Toy/Ch2/empty.toy

  • This file was added.
# RUN: toyc-ch2 %s -emit=ast 2>&1 | FileCheck %s
# CHECK-NOT: Assert
# CHECK: Parse error

mlir/test/Examples/Toy/Ch3/empty.toy

  • This file was added.
# RUN: toyc-ch3 %s -emit=ast 2>&1 | FileCheck %s
# CHECK-NOT: Assert
# CHECK: Parse error

mlir/test/Examples/Toy/Ch4/empty.toy

  • This file was added.
# RUN: toyc-ch4 %s -emit=ast 2>&1 | FileCheck %s
# CHECK-NOT: Assert
# CHECK: Parse error

mlir/test/Examples/Toy/Ch5/empty.toy

  • This file was added.
# RUN: toyc-ch5 %s -emit=ast 2>&1 | FileCheck %s
# CHECK-NOT: Assert
# CHECK: Parse error

mlir/test/Examples/Toy/Ch6/empty.toy

  • This file was added.
# RUN: toyc-ch6 %s -emit=ast 2>&1 | FileCheck %s
# CHECK-NOT: Assert
# CHECK: Parse error

mlir/test/Examples/Toy/Ch7/empty.toy

  • This file was added.
# RUN: toyc-ch7 %s -emit=ast 2>&1 | FileCheck %s
# CHECK-NOT: Assert
# CHECK-NOT: Parse error
# CHECK: Module