[flang] prep for merge

Original-commit: flang-compiler/f18@fa72384520af15c0901a41ebcea457fa1aa733a8
Reviewed-on: https://github.com/flang-compiler/f18/pull/133
Tree-same-pre-rewrite: false

diff --git a/flang/lib/parser/characters.cc b/flang/lib/parser/characters.cc
index 7885f2755fd3663c1562ef595c8ad9be67c4c2ae..6b6c2e97131c5fb20fb6205799f3bab041ee3934 100644 (file)
--- a/flang/lib/parser/characters.cc
+++ b/flang/lib/parser/characters.cc
@@ -83,11 +83,11 @@ std::optional<std::size_t> CountCharacters(
 }
 
 std::string QuoteCharacterLiteral(
-    const std::string &str, bool doubleDoubleQuotes, bool backslashEscapes) {
+    const std::string &str, bool doubleDoubleQuotes, bool doubleBackslash) {
   std::string result{'"'};
   const auto emit{[&](char ch) { result += ch; }};
   for (char ch : str) {
-    EmitQuotedChar(ch, emit, emit, doubleDoubleQuotes, backslashEscapes);
+    EmitQuotedChar(ch, emit, emit, doubleDoubleQuotes, doubleBackslash);
   }
   result += '"';
   return result;

diff --git a/flang/lib/parser/characters.h b/flang/lib/parser/characters.h
index 5559d509736102bda7d7f12f985d3eea3cb084e2..02b96b2470dc8c585bcb23602bcbea17560050ce 100644 (file)
--- a/flang/lib/parser/characters.h
+++ b/flang/lib/parser/characters.h
@@ -162,7 +162,7 @@ void EmitQuotedChar(char ch, const NORMAL &emit, const INSERTED &insert,
 }
 
 std::string QuoteCharacterLiteral(const std::string &,
-    bool doubleDoubleQuotes = true, bool backslashEscapes = true);
+    bool doubleDoubleQuotes = true, bool doubleBackslash = true);
 
 std::optional<int> UTF8CharacterBytes(const char *);
 std::optional<int> EUC_JPCharacterBytes(const char *);