Changeset 360

Timestamp:

Jan 31, 2007, 3:18:12 PM (17 years ago)

Author:

garonne

Message:

see C.L 321

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_deps_builder.cxx (modified) (8 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+
+2007-31-01 Vincent Garonne <garonne@lal.in2p3.fr> 321
+
+        * cmt_deps_builder.cxx:  Add support for space, line continuing character, etc.
+
 2006-15-11 Vincent Garonne <garonne@lal.in2p3.fr> 320
 

CMT/HEAD/source/cmt_deps_builder.cxx

@@ -118 +118 @@
                               CmtSystem::cmt_string_vector& deps)
 {
+
   char term = 0;
+  // To ignore leading spaces and tabs 
+  while ( (*ptr == ' ') or (*ptr == '\t'))
+  {
+    ptr++;
+  }
 
   if (*ptr == '#')
@@ -133 +139 @@
           ptr += 7;
 
-          while (*ptr == ' ') ptr++;
+          while ((*ptr == ' ') or (*ptr == '\t')) ptr++;
+          
           if (*ptr == '<')
             {
@@ -351 +358 @@
 {
   char* pattern = ptr + strlen (ptr);
-  int length = 0;
-
-  /*
+  int length    = 0;
+  char* pos;
+  
+
+    /*
     Even if we are inside a comment, we must detect strings since comment markers may 
     be written inside them.
-   */
-
-  char* pos = strchr (ptr, '"');
+  
+  pos = strchr (ptr, '"');
+  
   if ((pos != 0) && (pos < pattern) && (pos > ptr) && (*(pos-1) != '\\'))
     {
@@ -373 +382 @@
       length = 1;
     }
-
+ */
   pos = strstr (ptr, "*/");
   if ((pos != 0) && (pos < pattern))
     {
-      state = in_line;
+      state   = in_line;
       pattern = pos;
-      length = 2;
+      length  = 2;
     }
 
@@ -443 +452 @@
 static char* in_line_comment_action (char* ptr, state_def& state)
 {
-  ptr += strlen (ptr);
-  state = in_line;
-
+  char * pos = strchr (ptr, '\\');  
+ /* Extend this part to deal with continuation character */  
+  if ( (pos == NULL) || ( (ptr + strlen(ptr)-1)!=pos ))
+  {
+      state = in_line;
+  }
+  
+  ptr    += strlen (ptr);
+  
   return (ptr);
 }
@@ -467 +482 @@
       << dir_name << log_endl;
 
+
+  // erase of continuation character
   pos = 0;
   max_pos = strlen (text);
-
   char* current = text;
   char* last = text + max_pos;
+  while (current < last)
+  {
+   
+      char* crnl = strstr (current, "\\\r\n");
+      char* nl   = strstr (current, "\\\n");
+      
+      if ( (crnl==0) && (nl ==0)) break;
+      
+      int length = 0;
+            
+      char * ptr = 0;
+      if (nl==0)  //crnl > 0
+      {
+        length = 3;
+        ptr    = crnl; 
+      }      
+      else if (crnl==0) //nl > 0
+      {
+        length = 2;                        
+        ptr    = nl; 
+      }     
+      else if (crnl < nl)
+      {
+        length = 3;
+        ptr    = crnl;                 
+      }
+      else // (crnl > nl)
+      {
+        length = 2;                        
+        ptr    = nl;         
+      }
+      strcpy (ptr, ptr+length);
+      current = ptr;
+      last -= length;
+  } 
+  
+  pos = 0;
+  max_pos = strlen (text);
+  current = text;
+  last = text + max_pos;
 
   state_def state = at_start;
+  
 
   while (current < last)
     {
+             
       char marker;
       char* marker_pos = 0;
@@ -516 +574 @@
       if (first == 0)
         {
-          // neither nl nor cr+nl found => this is the last line
-
-          marker_pos = 0;
+          // neither nl nor cr+nl found => this is the last line
+               marker_pos = 0;
         }
       else
         {
-          marker_pos = first;
-          marker = *marker_pos;
-          *marker_pos = 0;
+          marker_pos = first;
+              marker = *marker_pos;
+              *marker_pos = 0;
         }
 
@@ -581 +638 @@
         }
     }
+            
 }