Fixed syntax of concatenated ObjC string constants so that it compiles again

on GCC 3.2


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@18959 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
nico 2004-03-29 16:34:09 +00:00
parent 1a0cf15c79
commit fe17b2af3e

View file

@ -1701,18 +1701,18 @@ main(int argc, char **argv, char **env)
// skeleton for table of contents files // skeleton for table of contents files
[tocSkel setString: @"<?xml version=\"1.0\"?>\n" [tocSkel setString: @"<?xml version=\"1.0\"?>\n"
"<!DOCTYPE gsdoc PUBLIC \"-//GNUstep//DTD gsdoc 1.0.1//EN\" \"http://www.gnustep.org/gsdoc-1_0_1.xml\">\n" @"<!DOCTYPE gsdoc PUBLIC \"-//GNUstep//DTD gsdoc 1.0.1//EN\" \"http://www.gnustep.org/gsdoc-1_0_1.xml\">\n"
"<gsdoc base=\"[typeU]\" stylesheeturl=\"gsdoc_contents\">\n" @"<gsdoc base=\"[typeU]\" stylesheeturl=\"gsdoc_contents\">\n"
" <head>\n" @" <head>\n"
" <title>[typeU]</title>\n" @" <title>[typeU]</title>\n"
" </head>\n" @" </head>\n"
" <body>\n" @" <body>\n"
" <chapter>\n" @" <chapter>\n"
" <index type=\"[typeL]\" scope=\"project\" target=\"mainFrame\"\n" @" <index type=\"[typeL]\" scope=\"project\" target=\"mainFrame\"\n"
" style=\"bare\" />\n" @" style=\"bare\" />\n"
" </chapter>\n" @" </chapter>\n"
" </body>\n" @" </body>\n"
"</gsdoc>\n"]; @"</gsdoc>\n"];
[tocSkel replaceOccurrencesOfString: @"[prjName]" withString: project [tocSkel replaceOccurrencesOfString: @"[prjName]" withString: project
options: 0 options: 0
range: NSMakeRange(0, [tocSkel length])]; range: NSMakeRange(0, [tocSkel length])];
@ -1720,26 +1720,26 @@ main(int argc, char **argv, char **env)
// file for top-left frame (header only; rest appended below) // file for top-left frame (header only; rest appended below)
idxIndexFile = [@"MainIndex" stringByAppendingPathExtension: @"html"]; idxIndexFile = [@"MainIndex" stringByAppendingPathExtension: @"html"];
[idxIndex setString: @"<HTML>\n <BODY>\n" [idxIndex setString: @"<HTML>\n <BODY>\n"
" <FONT FACE=\"sans\" SIZE=\"+1\"><B>Index</B></FONT><BR/><BR/>\n" @" <FONT FACE=\"sans\" SIZE=\"+1\"><B>Index</B></FONT><BR/><BR/>\n"
" <FONT FACE=\"sans\" SIZE=\"-1\">"]; @" <FONT FACE=\"sans\" SIZE=\"-1\">"];
// this becomes index.html // this becomes index.html
framesetFile = [@"index" stringByAppendingPathExtension: @"html"]; framesetFile = [@"index" stringByAppendingPathExtension: @"html"];
[frameset setString: @"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\"\"http://www.w3.org/TR/REC-html40/loose.dtd\">\n" [frameset setString: @"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\"\"http://www.w3.org/TR/REC-html40/loose.dtd\">\n"
"<HTML>\n" @"<HTML>\n"
" <HEAD>\n" @" <HEAD>\n"
" <TITLE>\n" @" <TITLE>\n"
" Autogsdoc-generated Documentation for [prjName]\n" @" Autogsdoc-generated Documentation for [prjName]\n"
" </TITLE>\n" @" </TITLE>\n"
" </HEAD>\n" @" </HEAD>\n"
" <FRAMESET cols=\"20%,80%\">\n" @" <FRAMESET cols=\"20%,80%\">\n"
" <FRAMESET rows=\"30%,70%\">\n" @" <FRAMESET rows=\"30%,70%\">\n"
" <FRAME src=\"MainIndex.html\" name=\"packageListFrame\">\n" @" <FRAME src=\"MainIndex.html\" name=\"packageListFrame\">\n"
" <FRAME src=\"ClassesTOC.html\" name=\"packageFrame\">\n" @" <FRAME src=\"ClassesTOC.html\" name=\"packageFrame\">\n"
" </FRAMESET>\n" @" </FRAMESET>\n"
" <FRAME src=\"[prjName].html\" name=\"mainFrame\">\n" @" <FRAME src=\"[prjName].html\" name=\"mainFrame\">\n"
" </FRAMESET>\n" @" </FRAMESET>\n"
"</HTML>\n"]; @"</HTML>\n"];
[frameset replaceOccurrencesOfString: @"[prjName]" withString: project [frameset replaceOccurrencesOfString: @"[prjName]" withString: project
options: 0 options: 0
range: NSMakeRange(0, [frameset length])]; range: NSMakeRange(0, [frameset length])];
@ -1809,25 +1809,25 @@ main(int argc, char **argv, char **env)
if (i == [gFiles count]) if (i == [gFiles count])
{ {
NSLog(@"\n\nNOTE: Generating a simple introductory page for your" NSLog(@"\n\nNOTE: Generating a simple introductory page for your"
" project.\nTo replace this with a custom version, edit the gsdoc file \n" @" project.\nTo replace this with a custom version, edit the gsdoc file \n"
"named %@ in the documentation output directory.\n" @"named %@ in the documentation output directory.\n"
"Then include this file in the arguments to autogsdoc.\n\n", prjFile); @"Then include this file in the arguments to autogsdoc.\n\n", prjFile);
NSMutableString *prjFileContents = NSMutableString *prjFileContents =
[NSMutableString stringWithCapacity: cap]; [NSMutableString stringWithCapacity: cap];
[prjFileContents setString: @"<?xml version=\"1.0\"?>\n" [prjFileContents setString: @"<?xml version=\"1.0\"?>\n"
"<!DOCTYPE gsdoc PUBLIC \"-//GNUstep//DTD gsdoc 1.0.1//EN\" \"http://www.gnustep.org/gsdoc-1_0_1.xml\">\n" @"<!DOCTYPE gsdoc PUBLIC \"-//GNUstep//DTD gsdoc 1.0.1//EN\" \"http://www.gnustep.org/gsdoc-1_0_1.xml\">\n"
"<gsdoc base=\"[prjName]\">\n" @"<gsdoc base=\"[prjName]\">\n"
" <head>\n" @" <head>\n"
" <title>The [prjName] Project</title>\n" @" <title>The [prjName] Project</title>\n"
" </head>\n" @" </head>\n"
" <body>\n" @" <body>\n"
" <chapter>\n" @" <chapter>\n"
" <p>The index below lists the major components of the [prjName] \n" @" <p>The index below lists the major components of the [prjName] \n"
" documentation.<br/></p>\n" @" documentation.<br/></p>\n"
" <index type=\"title\" scope=\"project\" target=\"mainFrame\" />\n" @" <index type=\"title\" scope=\"project\" target=\"mainFrame\" />\n"
" </chapter>\n" @" </chapter>\n"
" </body>\n" @" </body>\n"
"</gsdoc>\n"]; @"</gsdoc>\n"];
[prjFileContents replaceOccurrencesOfString: @"[prjName]" [prjFileContents replaceOccurrencesOfString: @"[prjName]"
withString: project withString: project
options: 0 options: 0