瀏覽代碼

STYLE: fix line length

Ken Martin 19 年之前
父節點
當前提交
bb88ef5e41

+ 3 - 1
Source/cmElseCommand.cxx

@@ -18,6 +18,8 @@
 
 bool cmElseCommand::InitialPass(std::vector<std::string> const&)
 {
-  this->SetError("An ELSE command was found outside of a proper IF ENDIF structure. Or its arguments did not match the opening IF command.");
+  this->SetError("An ELSE command was found outside of a proper "
+                 "IF ENDIF structure. Or its arguments did not match "
+                 "the opening IF command.");
   return false;
 }

+ 4 - 2
Source/cmEnableLanguageCommand.cxx

@@ -17,11 +17,13 @@
 #include "cmEnableLanguageCommand.h"
 
 // cmEnableLanguageCommand
-bool cmEnableLanguageCommand::InitialPass(std::vector<std::string> const& args)
+bool cmEnableLanguageCommand
+::InitialPass(std::vector<std::string> const& args)
 {
   if(args.size() < 1 )
     {
-    this->SetError("ENABLE_LANGUAGE called with incorrect number of arguments");
+    this->SetError
+      ("ENABLE_LANGUAGE called with incorrect number of arguments");
     return false;
     } 
   this->Makefile->EnableLanguage(args);

+ 5 - 2
Source/cmEndForEachCommand.cxx

@@ -16,9 +16,12 @@
 =========================================================================*/
 #include "cmEndForEachCommand.h"
 
-bool cmEndForEachCommand::InvokeInitialPass(std::vector<cmListFileArgument> const&)
+bool cmEndForEachCommand
+::InvokeInitialPass(std::vector<cmListFileArgument> const&)
 {
-  this->SetError("An ENDFOREACH command was found outside of a proper FOREACH ENDFOREACH structure. Or its arguments did not match the opening FOREACH command.");
+  this->SetError("An ENDFOREACH command was found outside of a proper "
+                 "FOREACH ENDFOREACH structure. Or its arguments did "
+                 "not match the opening FOREACH command.");
   return false;
 }
 

+ 3 - 1
Source/cmEndIfCommand.cxx

@@ -25,7 +25,9 @@ bool cmEndIfCommand::InitialPass(std::vector<std::string> const&)
     return true;
     }
   
-  this->SetError("An ENDIF command was found outside of a proper IF ENDIF structure. Or its arguments did not match the opening IF command.");
+  this->SetError("An ENDIF command was found outside of a proper "
+                 "IF ENDIF structure. Or its arguments did not match "
+                 "the opening IF command.");
   return false;
 }
 

+ 5 - 2
Source/cmEndWhileCommand.cxx

@@ -16,9 +16,12 @@
 =========================================================================*/
 #include "cmEndWhileCommand.h"
 
-bool cmEndWhileCommand::InvokeInitialPass(std::vector<cmListFileArgument> const&)
+bool cmEndWhileCommand
+::InvokeInitialPass(std::vector<cmListFileArgument> const&)
 {
-  this->SetError("An ENDWHILE command was found outside of a proper WHILE ENDWHILE structure. Or its arguments did not match the opening WHILE command.");
+  this->SetError("An ENDWHILE command was found outside of a proper "
+                 "WHILE ENDWHILE structure. Or its arguments did not "
+                 "match the opening WHILE command.");
   return false;
 }
 

+ 2 - 1
Source/cmExecProgramCommand.cxx

@@ -112,7 +112,8 @@ bool cmExecProgramCommand::InitialPass(std::vector<std::string> const& args)
     }
   else
     {
-    result = cmSystemTools::RunCommand(command.c_str(), output, retVal, 0, verbose);
+    result = cmSystemTools::RunCommand(command.c_str(), output, 
+                                       retVal, 0, verbose);
     }
   if(!result)
     {

+ 10 - 5
Source/cmExecuteProcessCommand.cxx

@@ -22,7 +22,8 @@
 void cmExecuteProcessCommandFixText(std::vector<char>& output);
 
 // cmExecuteProcessCommand
-bool cmExecuteProcessCommand::InitialPass(std::vector<std::string> const& args)
+bool cmExecuteProcessCommand
+::InitialPass(std::vector<std::string> const& args)
 {
   if(args.size() < 1 )
     {
@@ -241,11 +242,13 @@ bool cmExecuteProcessCommand::InitialPass(std::vector<std::string> const& args)
     }
   if(!output_file.empty())
     {
-    cmsysProcess_SetPipeFile(cp, cmsysProcess_Pipe_STDOUT, output_file.c_str());
+    cmsysProcess_SetPipeFile(cp, cmsysProcess_Pipe_STDOUT, 
+                             output_file.c_str());
     }
   if(!error_file.empty())
     {
-    cmsysProcess_SetPipeFile(cp, cmsysProcess_Pipe_STDERR, error_file.c_str());
+    cmsysProcess_SetPipeFile(cp, cmsysProcess_Pipe_STDERR, 
+                             error_file.c_str());
     }
 
   // Set the timeout if any.
@@ -297,11 +300,13 @@ bool cmExecuteProcessCommand::InitialPass(std::vector<std::string> const& args)
   // Store the output obtained.
   if(!output_variable.empty() && tempOutput.size())
     {
-    this->Makefile->AddDefinition(output_variable.c_str(), &*tempOutput.begin());
+    this->Makefile->AddDefinition(output_variable.c_str(), 
+                                  &*tempOutput.begin());
     }
   if(!merge_output && !error_variable.empty() && tempError.size())
     {
-    this->Makefile->AddDefinition(error_variable.c_str(), &*tempError.begin());
+    this->Makefile->AddDefinition(error_variable.c_str(), 
+                                  &*tempError.begin());
     }
 
   // Store the result of running the process.

+ 3 - 3
Source/cmExecuteProcessCommand.h

@@ -91,9 +91,9 @@ public:
       "the result of running the processes.  This will be an integer return "
       "code from the last child or a string describing an error condition.  "
       "If OUTPUT_VARIABLE or ERROR_VARIABLE are given the variable named "
-      "will be set with the contents of the standard output and standard error "
-      "pipes respectively.  If the same variable is named for both pipes "
-      "their output will be merged in the order produced.  "
+      "will be set with the contents of the standard output and standard "
+      "error pipes respectively.  If the same variable is named for both "
+      "pipes their output will be merged in the order produced.  "
       "If INPUT_FILE, OUTPUT_FILE, or ERROR_FILE is given the file named "
       "will be attached to the standard input of the first process, "
       "standard output of the last process, or standard error of all "

+ 5 - 5
Source/cmExportLibraryDependencies.cxx

@@ -23,12 +23,12 @@
 #include <cmsys/auto_ptr.hxx>
 
 // cmExecutableCommand
-bool cmExportLibraryDependenciesCommand::InitialPass(std::vector<std::string> const& args)
+bool cmExportLibraryDependenciesCommand
+::InitialPass(std::vector<std::string> const& args)
 {
-  // First argument is the name of the test
-  // Second argument is the name of the executable to run (a target or external
-  //    program)
-  // Remaining arguments are the arguments to pass to the executable
+  // First argument is the name of the test Second argument is the name of
+  // the executable to run (a target or external program) Remaining arguments
+  // are the arguments to pass to the executable
   if(args.size() < 1 )
     {
     this->SetError("called with incorrect number of arguments");

+ 4 - 2
Source/cmExportLibraryDependencies.h

@@ -22,7 +22,8 @@
 /** \class cmExportLibraryDependenciesCommand
  * \brief Add a test to the lists of tests to run.
  *
- * cmExportLibraryDependenciesCommand adds a test to the list of tests to run .
+ * cmExportLibraryDependenciesCommand adds a test to the list of tests to run
+ * 
  */
 class cmExportLibraryDependenciesCommand : public cmCommand
 {
@@ -57,7 +58,8 @@ public:
    */
   virtual const char* GetTerseDocumentation() 
     {
-    return "Write out the dependency information for all targets of a project.";
+    return 
+      "Write out the dependency information for all targets of a project.";
     }
   
   /**

+ 12 - 7
Source/cmExprLexer.cxx

@@ -165,7 +165,8 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 
     #define YY_LESS_LINENO(n)
     
-/* Return all but the first "n" matched characters back to the input stream. */
+/* Return all but the first "n" matched characters back to the input
+   stream. */
 #define yyless(n) \
   do \
     { \
@@ -264,8 +265,8 @@ struct yy_buffer_state
                           ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \
                           : NULL)
 
-/* Same as previous macro, but useful when we know that the buffer stack is not
- * NULL or when we need an lvalue. For internal use only.
+/* Same as previous macro, but useful when we know that the buffer stack is
+ * not NULL or when we need an lvalue. For internal use only.
  */
 #define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top]
 
@@ -327,7 +328,8 @@ typedef int yy_state_type;
 #define yytext_ptr yytext_r
 
 static yy_state_type yy_get_previous_state (yyscan_t yyscanner );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state  ,yyscan_t yyscanner);
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  ,
+                                       yyscan_t yyscanner);
 static int yy_get_next_buffer (yyscan_t yyscanner );
 static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
 
@@ -456,7 +458,8 @@ This file must be translated to C and modified to build everywhere.
 
 Run flex like this:
 
-  flex --prefix=cmExpr_yy --header-file=cmExprLexer.h -ocmExprLexer.cxx cmExprLexer.in.l
+  flex --prefix=cmExpr_yy --header-file=cmExprLexer.h -ocmExprLexer.cxx
+  cmExprLexer.in.l
 
 Modify cmExprLexer.cxx:
   - remove TABs
@@ -535,7 +538,8 @@ struct yyguts_t
     /* User-defined. Not touched by flex. */
     YY_EXTRA_TYPE yyextra_r;
 
-    /* The rest are the same as the globals declared in the non-reentrant scanner. */
+    /* The rest are the same as the globals declared in the non-reentrant
+       scanner. */
     FILE *yyin_r, *yyout_r;
     size_t yy_buffer_stack_top; /**< index of top of stack. */
     size_t yy_buffer_stack_max; /**< capacity of stack. */
@@ -1137,7 +1141,8 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
   return ret_val;
 }
 
-/* yy_get_previous_state - get the state just before the EOB char was reached */
+/* yy_get_previous_state - get the state just before the EOB char was
+   reached */
 
     static yy_state_type yy_get_previous_state (yyscan_t yyscanner)
 {

+ 2 - 1
Source/cmExprLexer.h

@@ -300,7 +300,8 @@ extern int cmExpr_yylex (yyscan_t yyscanner);
 #define YY_DECL int cmExpr_yylex (yyscan_t yyscanner)
 #endif /* !YY_DECL */
 
-/* yy_get_previous_state - get the state just before the EOB char was reached */
+/* yy_get_previous_state - get the state just before the EOB char was
+   reached */
 
 #undef YY_NEW_FILE
 #undef YY_FLUSH_BUFFER