Changeset 657 for CMT/HEAD

Timestamp:

Dec 5, 2013, 3:21:17 PM (10 years ago)

Author:

rybkin

Message:

See C.L. 516

Location:

CMT/HEAD

Files:

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

CMT/HEAD/ChangeLog

@@ +1 @@
+2013-12-05    <rybkin@lal.in2p3.fr> 516
+
+        * source/cmt_deps_builder.cxx: In helper function at_start_action, fix
+        parsing Fortran INCLUDE statement, optimise in_line_action helper function,
+        in helper function build_deps_text, fix parsing C++ style comments in case
+        without other characters
+        * source/cmt_parser.cxx: In class Cmt function do_broadcast, add package,
+        version, offset info to printout of "cmt broadcast" command, similar to
+        printout in CMTBCAST mode
+        
 2013-12-03    <rybkin@lal.in2p3.fr> 515
 

CMT/HEAD/source/cmt_deps_builder.cxx

@@ -226 +226 @@
         }
     }
-  else if (!strncmp (ptr, "      include", 13))
+  else if (!strncmp (ptr, "include", 7) ||
+           !strncmp (ptr, "INCLUDE", 7))
+  //  else if (!strncmp (ptr, "      include", 13))
     {
       // fortran include statement
 
-      ptr += 13;
+      ptr += 7;
+      //ptr += 13;
 
       while ((*ptr == ' ') || (*ptr == '\t')) ptr++;
@@ -239 +242 @@
           ptr++;
         }
+      else if (*ptr == '(')
+        {
+          term = ')';
+          ptr++;
+        }
       else
         {
@@ -245 +253 @@
         }
     }
+  /*
   else if (!strncmp (ptr, "\tinclude", 8))
     {
@@ -264 +273 @@
         }
     }
+  */
   else
     {
@@ -308 +318 @@
 static char* in_line_action (char* ptr, state_def& state)
 {
-  char* pattern = ptr + strlen (ptr);
-  int length = 0;
+  //  char* pattern = ptr + strlen (ptr);\
+  //  int length = 0;
 
   /*
@@ -318 +328 @@
   */
 
+  char* beg = ptr;
+  while (char* p = strpbrk (beg, "\"\'/"))
+    if (*p == '"')
+      {
+        if (p == ptr || (p > ptr && *(p - 1) != '\\'))
+          {
+            state = in_string;
+            return p + 1;
+          }
+        else
+          { // '"' is escaped
+            beg += 1;
+          }
+      }
+    else if (*p == '\'')
+      {
+        if (p == ptr || (p > ptr && *(p - 1) != '\\'))
+          {
+            state = in_char;
+            return p + 1;
+          }
+        else
+          { // '\'' is escaped
+            beg += 1;
+          }
+      }
+    else
+      { // we have '/'
+        if (*(p + 1) == '*')
+          {
+            state = in_comment;
+            return p + 2;
+          }
+        else if (*(p + 1) == '/')
+          {
+            state = in_line_comment;
+            return p + 2;
+          }
+        else
+          {
+            beg += 1;
+          }
+      }
+  /*
   char* pos = strchr (ptr, '"');
   if ((pos != 0) && (pos < pattern) && (pos > ptr) && (*(pos-1) != '\\'))
@@ -334 +388 @@
     }
 
-  pos = strstr (ptr, "/*");   //*/
+  pos = strstr (ptr, "/*");
   if ((pos != 0) && (pos < pattern))
     {
@@ -351 +405 @@
 
   ptr = pattern + length;
-
   return (ptr);
+*/
+  return  ptr + strlen (ptr);
 }
 
@@ -650 +705 @@
         } // while (strlen (ptr) > 0)
       
-      if (state == in_line) state = at_start;
+      //if (state == in_line) state = at_start;
+      switch (state)
+        {
+        case in_line:
+        case in_line_comment:
+          state = at_start;
+          break;
+        }
       line_number++;
 

CMT/HEAD/source/cmt_parser.cxx

@@ -2301 +2301 @@
     {
       cout << "#--------------------------------------------------------------" << endl;
-      cout << "# Now trying [" << cmd << "] in " << s << " (" << i+1 << "/" << uses.size () 
+      cout << "# " << p << " " << v << " " << offset << ": Now trying [" << cmd << "] in " << s << " (" << i+1 << "/" << uses.size () 
            << ")" << endl;
       cout << "#--------------------------------------------------------------" << endl;