diff mbox series

[C++] String concatenation is a thing

Message ID c9730fde-73ff-df11-2f6c-9fe92e86f8f9@acm.org
State New
Headers show
Series [C++] String concatenation is a thing | expand

Commit Message

Nathan Sidwell Oct. 4, 2018, 11:35 a.m. UTC 
We've had string literal concatenation since we dropped K&R build 
support.  Let's use it to make things more readable.

Applying to trunk.

nathan
diff mbox series

Patch

2018-10-04  Nathan Sidwell  <nathan@acm.org>

	* lang-specs.h: Use string contatenation, not line splicing.

Index: lang-specs.h
===================================================================
--- lang-specs.h	(revision 264838)
+++ lang-specs.h	(working copy)
@@ -40,29 +40,31 @@  along with GCC; see the file COPYING3.
   {".tcc", "@c++-header", 0, 0, 0},
   {".hh",  "@c++-header", 0, 0, 0},
   {"@c++-header",
-    "%{E|M|MM:cc1plus -E %(cpp_options) %2 %(cpp_debug_options)}\
-     %{!E:%{!M:%{!MM:\
-       %{save-temps*|no-integrated-cpp:cc1plus -E\
-		%(cpp_options) %2 -o %{save-temps*:%b.ii} %{!save-temps*:%g.ii} \n}\
-      cc1plus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}\
-	      %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\
-	%(cc1_options) %2\
-	%{!fsyntax-only:%{!S:-o %g.s} \
-	    %{!fdump-ada-spec*:%{!o*:--output-pch=%i.gch}\
-			       %W{o*:--output-pch=%*}}%V}}}}",
+      "%{E|M|MM:cc1plus -E %(cpp_options) %2 %(cpp_debug_options)}"
+      "%{!E:%{!M:%{!MM:"
+      "  %{save-temps*|no-integrated-cpp:cc1plus -E"
+      "	   %(cpp_options) %2 -o %{save-temps*:%b.ii} %{!save-temps*:%g.ii} \n}"
+      "  cc1plus %{save-temps*|no-integrated-cpp:-fpreprocessed"
+      " 	   %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}"
+      "  %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}"
+      "  %(cc1_options) %2"
+      "  %{!fsyntax-only:%{!S:-o %g.s}"
+      "    %{!fdump-ada-spec*:%{!o*:--output-pch=%i.gch}"
+      "      %W{o*:--output-pch=%*}}%V}}}}",
      CPLUSPLUS_CPP_SPEC, 0, 0},
   {"@c++",
-    "%{E|M|MM:cc1plus -E %(cpp_options) %2 %(cpp_debug_options)}\
-     %{!E:%{!M:%{!MM:\
-       %{save-temps*|no-integrated-cpp:cc1plus -E\
-		%(cpp_options) %2 -o %{save-temps*:%b.ii} %{!save-temps*:%g.ii} \n}\
-      cc1plus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}\
-	      %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\
-	%(cc1_options) %2\
-       %{!fsyntax-only:%(invoke_as)}}}}",
-     CPLUSPLUS_CPP_SPEC, 0, 0},
+      "%{E|M|MM:cc1plus -E %(cpp_options) %2 %(cpp_debug_options)}"
+      "%{!E:%{!M:%{!MM:"
+      "  %{save-temps*|no-integrated-cpp:cc1plus -E"
+      "	   %(cpp_options) %2 -o %{save-temps*:%b.ii} %{!save-temps*:%g.ii} \n}"
+      "  cc1plus %{save-temps*|no-integrated-cpp:-fpreprocessed"
+      " 	   %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}"
+      "  %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}"
+      "	 %(cc1_options) %2"
+      "  %{!fsyntax-only:%(invoke_as)}}}}",
+      CPLUSPLUS_CPP_SPEC, 0, 0},
   {".ii", "@c++-cpp-output", 0, 0, 0},
   {"@c++-cpp-output",
-   "%{!M:%{!MM:%{!E:\
-    cc1plus -fpreprocessed %i %(cc1_options) %2\
-    %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
+      "%{!E:%{!M:%{!MM:"
+      "  cc1plus -fpreprocessed %i %(cc1_options) %2"
+      "  %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},