From 6a1b208a4d9dba02779759cf929253ad6ea7806c Mon Sep 17 00:00:00 2001 From: Jean Perier Date: Tue, 4 Jun 2019 02:11:58 -0700 Subject: [PATCH] [flang] Answer first comments Original-commit: flang-compiler/f18@4058efcd9c413f90aeeb9fdb83608bcb4a647e6e Reviewed-on: https://github.com/flang-compiler/f18/pull/471 Tree-same-pre-rewrite: false --- flang/lib/evaluate/character.h | 6 +++--- flang/lib/parser/prescan.cc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flang/lib/evaluate/character.h b/flang/lib/evaluate/character.h index 8dd454d..e17407c 100644 --- a/flang/lib/evaluate/character.h +++ b/flang/lib/evaluate/character.h @@ -44,7 +44,7 @@ public: } else if constexpr (KIND == 4) { return IsValidUCS4(code); } else { - static_assert(true, "bad character kind"); + static_assert(KIND != KIND, "bad character kind"); } } @@ -87,8 +87,8 @@ private: std::uint16_t lo{static_cast(code & 0xff)}; return IsValidASCII(code) || (code < 0xffff && - ((0xa1 <= hi && hi <= 0Xfe && 0xa1 <= lo && lo <= 0Xfe) || - (hi == 0X8e && 0xa1 <= lo && lo <= 0Xdf))); + ((0xa1 <= hi && hi <= 0xfe && 0xa1 <= lo && lo <= 0xfe) || + (hi == 0x8e && 0xa1 <= lo && lo <= 0xdf))); } static constexpr bool IsValidUCS4(std::uint64_t code) { return code < 0xd800 || (0xdc00 < code && code <= 0x10ffff); diff --git a/flang/lib/parser/prescan.cc b/flang/lib/parser/prescan.cc index 049cc7f..399dbd1 100644 --- a/flang/lib/parser/prescan.cc +++ b/flang/lib/parser/prescan.cc @@ -545,7 +545,7 @@ void Prescanner::QuotedCharacterLiteral( bool escape{false}; bool escapesEnabled{features_.IsEnabled(LanguageFeature::BackslashEscapes)}; while (true) { - unsigned char ch{static_cast(*at_)}; + char32_t ch{static_cast(*at_)}; escape = !escape && ch == '\\' && escapesEnabled; EmitQuotedChar(ch, emit, insert, false, !escapesEnabled); while (PadOutCharacterLiteral(tokens)) { -- 2.7.4