From: peter klausler Date: Tue, 17 Apr 2018 21:45:43 +0000 (-0700) Subject: [flang] reformat X-Git-Tag: llvmorg-12-init~9537^2~2703 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bdc1577188e595df7dc3fd50eb657849cb1490e2;p=platform%2Fupstream%2Fllvm.git [flang] reformat Original-commit: flang-compiler/f18@4a4648facdf671b75cc2f63b13f7f382e4206039 Reviewed-on: https://github.com/flang-compiler/f18/pull/59 Tree-same-pre-rewrite: false --- diff --git a/flang/lib/parser/grammar.h b/flang/lib/parser/grammar.h index 8512e40..d742f88 100644 --- a/flang/lib/parser/grammar.h +++ b/flang/lib/parser/grammar.h @@ -3414,8 +3414,8 @@ TYPE_PARSER(construct{}(Parser{}) || construct{}(name)) // R1523 actual-arg-spec -> [keyword =] actual-arg -TYPE_PARSER( - construct{}(maybe(keyword / "=" / !"="_ch), Parser{})) +TYPE_PARSER(construct{}( + maybe(keyword / "=" / !"="_ch), Parser{})) // R1524 actual-arg -> // expr | variable | procedure-name | proc-component-ref | diff --git a/flang/lib/parser/message.h b/flang/lib/parser/message.h index 3c35bd1..120cdba 100644 --- a/flang/lib/parser/message.h +++ b/flang/lib/parser/message.h @@ -81,7 +81,6 @@ private: std::size_t bytes_{1}; }; - class Message : public ReferenceCounted { public: using Context = CountedReference; @@ -94,14 +93,15 @@ public: Message(Provenance p, MessageFixedText t, Message *c = nullptr) : provenance_{p}, text_{t}, context_{c}, isFatal_{t.isFatal()} {} Message(Provenance p, MessageFormattedText &&s, Message *c = nullptr) - : provenance_{p}, string_{s.MoveString()}, context_{c}, - isFatal_{s.isFatal()} {} + : provenance_{p}, string_{s.MoveString()}, context_{c}, isFatal_{ + s.isFatal()} {} Message(Provenance p, MessageExpectedText t, Message *c = nullptr) : provenance_{p}, text_{t.AsMessageFixedText()}, isExpectedText_{true}, context_{c}, isFatal_{true} {} Message(const char *csl, MessageFixedText t, Message *c = nullptr) - : cookedSourceLocation_{csl}, text_{t}, context_{c}, isFatal_{t.isFatal()} {} + : cookedSourceLocation_{csl}, text_{t}, context_{c}, isFatal_{t.isFatal()} { + } Message(const char *csl, MessageFormattedText &&s, Message *c = nullptr) : cookedSourceLocation_{csl}, string_{s.MoveString()}, context_{c}, isFatal_{s.isFatal()} {} diff --git a/flang/lib/parser/parse-state.h b/flang/lib/parser/parse-state.h index 69716ad..1f3c13c 100644 --- a/flang/lib/parser/parse-state.h +++ b/flang/lib/parser/parse-state.h @@ -46,8 +46,8 @@ public: warnOnDeprecatedUsage_{that.warnOnDeprecatedUsage_}, anyErrorRecovery_{that.anyErrorRecovery_}, anyConformanceViolation_{that.anyConformanceViolation_}, - deferMessages_{that.deferMessages_}, - anyDeferredMessages_{that.anyDeferredMessages_} {} + deferMessages_{that.deferMessages_}, anyDeferredMessages_{ + that.anyDeferredMessages_} {} ParseState &operator=(const ParseState &that) { p_ = that.p_, limit_ = that.limit_; userState_ = that.userState_, inFixedForm_ = that.inFixedForm_; diff --git a/flang/lib/parser/reference-counted.h b/flang/lib/parser/reference-counted.h index 8498dcd..d7aaba2 100644 --- a/flang/lib/parser/reference-counted.h +++ b/flang/lib/parser/reference-counted.h @@ -14,9 +14,10 @@ public: void TakeReference() { ++references_; } void DropReference() { if (--references_ == 0) { - delete static_cast(this); + delete static_cast(this); } } + private: int references_{0}; };