Changeset 399 for CMT

Timestamp:

Apr 20, 2007, 12:50:46 PM (17 years ago)

Author:

garonne

Message:

correct
by \...

Location:

CMT/HEAD/source

Files:

• cmt_deps_builder.cxx (modified) (20 diffs)
• cmt_syntax.cxx (modified) (15 diffs)

CMT/HEAD/source/cmt_deps_builder.cxx

@@ -121 +121 @@
   char term = 0;
   // To ignore leading spaces and tabs 
-  while ( (*ptr == ' ') || (*ptr == '\\t'))
+  while ( (*ptr == ' ') || (*ptr == '\t'))
   {
     ptr++;
@@ -131 +131 @@
 
       // skip spaces 
-      while ((*ptr == ' ') || (*ptr == '\\t')) ptr++;
+      while ((*ptr == ' ') || (*ptr == '\t')) ptr++;
 
       if (!strncmp (ptr, "include", 7))
@@ -139 +139 @@
           ptr += 7;
 
-          while ((*ptr == ' ') || (*ptr == '\\t')) ptr++;
+          while ((*ptr == ' ') || (*ptr == '\t')) ptr++;
           
           if (*ptr == '<')
@@ -174 +174 @@
       ptr += 13;
 
-      while ((*ptr == ' ') || (*ptr == '\\t')) ptr++;
-
-      if (*ptr == '\\'')
-        {
-          term = '\\'';
+      while ((*ptr == ' ') || (*ptr == '\t')) ptr++;
+
+      if (*ptr == '\'')
+        {
+          term = '\'';
           ptr++;
         }
@@ -187 +187 @@
         }
     }
-  else if (!strncmp (ptr, "\\tinclude", 8))
+  else if (!strncmp (ptr, "\tinclude", 8))
     {
       // fortran include statement
@@ -193 +193 @@
       ptr += 8;
 
-      while ((*ptr == ' ') || (*ptr == '\\t')) ptr++;
-
-      if (*ptr == '\\'')
-        {
-          term = '\\'';
+      while ((*ptr == ' ') || (*ptr == '\t')) ptr++;
+
+      if (*ptr == '\'')
+        {
+          term = '\'';
           ptr++;
         }
@@ -256 +256 @@
     {single-quote double-quote open-comment open-line-comment}
 
-    Must exclude escaped quotes \\' and \\"
+    Must exclude escaped quotes \' and \"
   */
 
   char* pos = strchr (ptr, '"');
-  if ((pos != 0) && (pos < pattern) && (pos > ptr) && (*(pos-1) != '\\\\'))
+  if ((pos != 0) && (pos < pattern) && (pos > ptr) && (*(pos-1) != '\\'))
     {
       state = in_string;
@@ -267 +267 @@
     }
 
-  pos = strchr (ptr, '\\'');
-  if ((pos != 0) && (pos < pattern) && (pos > ptr) && (*(pos-1) != '\\\\'))
+  pos = strchr (ptr, '\'');
+  if ((pos != 0) && (pos < pattern) && (pos > ptr) && (*(pos-1) != '\\'))
     {
       state = in_char;
@@ -311 +311 @@
   else
     {
-      if ((pos > ptr) && (*(pos - 1) == '\\\\'))
+      if ((pos > ptr) && (*(pos - 1) == '\\'))
         {
           ptr = pos + 1;
@@ -330 +330 @@
   // we exclusively look for a single quote
 
-  char* pos = strchr (ptr, '\\'');
+  char* pos = strchr (ptr, '\'');
   if (pos == 0)
     {
@@ -340 +340 @@
   else
     {
-      if ((pos > ptr) && (*(pos - 1) == '\\\\'))
+      if ((pos > ptr) && (*(pos - 1) == '\\'))
         {
           ptr = pos + 1;
@@ -368 +368 @@
   pos = strchr (ptr, '"');
   
-  if ((pos != 0) && (pos < pattern) && (pos > ptr) && (*(pos-1) != '\\\\'))
+  if ((pos != 0) && (pos < pattern) && (pos > ptr) && (*(pos-1) != '\\'))
     {
       state = in_string_comment;
@@ -375 +375 @@
     }
 
-  pos = strchr (ptr, '\\'');
-  if ((pos != 0) && (pos < pattern) && (pos > ptr) && (*(pos-1) != '\\\\'))
+  pos = strchr (ptr, '\'');
+  if ((pos != 0) && (pos < pattern) && (pos > ptr) && (*(pos-1) != '\\'))
     {
       state = in_char_comment;
@@ -408 +408 @@
   else
     {
-      if ((pos > ptr) && (*(pos - 1) == '\\\\'))
+      if ((pos > ptr) && (*(pos - 1) == '\\'))
         {
           ptr = pos + 1;
@@ -425 +425 @@
 static char* in_char_comment_action (char* ptr, state_def& state)
 {
-  char* pos = strchr (ptr, '\\'');
+  char* pos = strchr (ptr, '\'');
   if (pos == 0)
     {
@@ -434 +434 @@
   else
     {
-      if ((pos > ptr) && (*(pos - 1) == '\\\\'))
+      if ((pos > ptr) && (*(pos - 1) == '\\'))
         {
           ptr = pos + 1;
@@ -452 +452 @@
 static char* in_line_comment_action (char* ptr, state_def& state)
 {
-  char * pos = strchr (ptr, '\\\\');  
+  char * pos = strchr (ptr, '\\');  
  /* Extend this part to deal with continuation character */  
   if ( (pos == NULL) || ( (ptr + strlen(ptr)-1)!=pos ))
@@ -491 +491 @@
   {
    
-      char* crnl = strstr (current, "\\\\\\r\\n");
-      char* nl   = strstr (current, "\\\\\\n");
+      char* crnl = strstr (current, "/r\n");
+      char* nl   = strstr (current, "\\\n");
       
       if ( (crnl==0) && (nl ==0)) break;
@@ -538 +538 @@
       char* marker_pos = 0;
 
-      char* crnl = strstr (current, "\\r\\n");
-      char* nl = strchr (current, '\\n');
+      char* crnl = strstr (current, "\r\n");
+      char* nl = strchr (current, '\n');
 
       char* first = nl;
@@ -912 +912 @@
         //
 
-      output.replace_all ("\\n", " ");
-      output.replace_all ("\\\\ ", " ");
+      output.replace_all ("\n", " ");
+      output.replace_all ("\\ ", " ");
       
       CmtSystem::cmt_string_vector files;
       
-      CmtSystem::split (output, " \\t", files);
+      CmtSystem::split (output, " \t", files);
 
         //

CMT/HEAD/source/cmt_syntax.cxx

@@ -269 +269 @@
                cmt_string s  = "build_strategy ";
            s             += words[i];
-           s             += "\\n";            
+           s             += "\n";            
                bool no_found = true;                     
            int size =  project->m_extra_lines.size ();
@@ -1099 +1099 @@
         cmt_string s  = "setup_strategy ";
         s             += words[i];
-        s             += "\\n";            
+        s             += "\n";            
         bool no_found = true;                    
         int size =  project->m_extra_lines.size ();
@@ -1202 +1202 @@
             cmt_string s  = "structure_strategy ";
         s             += words[i];
-        s             += "\\n";            
+        s             += "\n";            
         bool no_found = true;                    
         int size =  project->m_extra_lines.size ();
@@ -1357 +1357 @@
  *  Parse the input file, rejecting comments and
  * rebuilding complete lines (from sections separated by
- *  \\ characters.
+ *  \ characters.
  *
  *  Each reformatted line is parsed by filter_line
@@ -1396 +1396 @@
               //  {
               //      Use* tuse = use->sub_uses[n];
-              //      cerr << "\\tpackage file [" << tuse->get_package_name() << "]" <<p_use->get_package_name()<< endl;         
+              //      cerr << "\tpackage file [" << tuse->get_package_name() << "]" <<p_use->get_package_name()<< endl;         
               //  }
               //}
@@ -1429 +1429 @@
             bool found = false;
             int  size  = uses.size ();
-            // cerr << "\\n size:"<<size<< ":" << endl;     
+            // cerr << "\n size:"<<size<< ":" << endl;     
             for (int n = 0; n < size; n++)
             {
                 Use* tuse = uses[n];
-                // cerr << "\\tpackage file [" << tuse->get_package_name() << "]" <<p_use->get_package_name()<< endl;                    
+                // cerr << "\tpackage file [" << tuse->get_package_name() << "]" <<p_use->get_package_name()<< endl;                    
                 if (tuse->get_package_name()==p_use->get_package_name())
                    found=true;
@@ -1462 +1462 @@
  *  Parse a text, rejecting comments and
  * rebuilding complete lines (from sections separated by
- *  \\ characters.
+ *  \ characters.
  *
  *  Each reformatted line is parsed by filter_line
@@ -1654 +1654 @@
  *  Parse a text, rejecting comments and
  * rebuilding complete lines (from sections separated by
- *  \\ characters.
+ *  \ characters.
  *
  *  Each reformatted line is parsed by filter_line
@@ -1681 +1681 @@
   for (pos = 0; pos < max_pos;)
     {
-      int cr = text.find (pos, "\\r\\n");
-      int nl = text.find (pos, '\\n');
+      int cr = text.find (pos, "\r\n");
+      int nl = text.find (pos, '\n');
       int first = nl;
       int length = 1;
@@ -1742 +1742 @@
   if (temp_line[0] == '#') return;
 
-  nl = temp_line.find_last_of ('\\n');
+  nl = temp_line.find_last_of ('\n');
   if (nl != cmt_string::npos) temp_line.erase (nl);
 
@@ -1760 +1760 @@
   length = temp_line.size ();
 
-  back_slash = temp_line.find_last_of ('\\\\');
+  back_slash = temp_line.find_last_of ('\\');
 
   if (back_slash != cmt_string::npos)
@@ -1774 +1774 @@
         {
           char c = temp_line[i];
-          if ((c != ' ') && (c != '\\t'))
+          if ((c != ' ') && (c != '\t'))
             {
               at_end = false;
@@ -1808 +1808 @@
     o Special characters are filtered now :
     
-    <cmt:tab/>  \\t
-    <cmt:cr/>   \\r
-    <cmt:lf/>   \\n
+    <cmt:tab/>  \t
+    <cmt:cr/>   \r
+    <cmt:lf/>   \n
     
     o Split into words (a word is a string not containing
@@ -1819 +1819 @@
   */
 
-  m_filtered_text.replace_all ("<cmt:tab/>", "\\t");
-  m_filtered_text.replace_all ("<cmt:cr/>",  "\\r");
-  m_filtered_text.replace_all ("<cmt:lf/>",  "\\n");
+  m_filtered_text.replace_all ("<cmt:tab/>", "\t");
+  m_filtered_text.replace_all ("<cmt:cr/>",  "\r");
+  m_filtered_text.replace_all ("<cmt:lf/>",  "\n");
 
   if (Cmt::get_debug ())
@@ -1830 +1830 @@
   static CmtSystem::cmt_string_vector words;
   
-  CmtSystem::split (m_filtered_text, " \\t", words);
+  CmtSystem::split (m_filtered_text, " \t", words);
   
   if (words.size () != 0)