From 148b7d1f4a8691675f9f8fe60bc425ad47ba344a Mon Sep 17 00:00:00 2001 From: peter klausler Date: Wed, 11 Jul 2018 10:22:05 -0700 Subject: [PATCH] [flang] merge and reformat Original-commit: flang-compiler/f18@2e3d67aa79e1e7e0af58e1d21bb500a987338c03 Reviewed-on: https://github.com/flang-compiler/f18/pull/119 Tree-same-pre-rewrite: false --- flang/lib/parser/grammar.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/flang/lib/parser/grammar.h b/flang/lib/parser/grammar.h index 886e9ef..085c882 100644 --- a/flang/lib/parser/grammar.h +++ b/flang/lib/parser/grammar.h @@ -659,10 +659,11 @@ TYPE_PARSER(construct(Parser{}) || construct(Parser{})) // R730 end-type-stmt -> END TYPE [type-name] -constexpr auto missingOptionalName {defaulted(cut >> maybe(name))}; +constexpr auto missingOptionalName{defaulted(cut >> maybe(name))}; constexpr auto noNameEnd{"END" >> missingOptionalName}; constexpr auto bareEnd{noNameEnd / lookAhead(endOfStmt)}; -constexpr auto endStmtErrorRecovery{("END"_tok / SkipTo<'\n'>{} || consumedAllInput) >> missingOptionalName}; +constexpr auto endStmtErrorRecovery{ + ("END"_tok / SkipTo<'\n'>{} || consumedAllInput) >> missingOptionalName}; TYPE_PARSER(construct( recovery("END TYPE" >> maybe(name), endStmtErrorRecovery))) -- 2.7.4