Changeset 607 for CMT/HEAD/source/cmt_awk.cxx

Timestamp:

Apr 3, 2012, 3:54:50 PM (12 years ago)

Author:

rybkin

Message:

See C.L. 482

File:

• CMT/HEAD/source/cmt_awk.cxx (modified) (6 diffs)

CMT/HEAD/source/cmt_awk.cxx

@@ -40 +40 @@
 
     cmt_string line;
+    /*
     int pos;
     int max_pos;
@@ -45 +46 @@
     pos = 0;
     max_pos = text.size ();
-
+    */
     m_accumulator.erase (0);
 
+    int nl;
+    int begin = 0;
+    int end = text.size ();
+    
+    while ((nl = text.find (begin, '\n')) != cmt_string::npos)
+      {
+        if (begin < nl && text[nl - 1] == '\r')
+          {
+            text.substr (begin, nl - 1 - begin, line);
+          }
+        else
+          {
+            text.substr (begin, nl - begin, line);
+          }
+        //      cerr << "|Awk::condition parse> [" << line << "]" << endl;
+        begin = nl + 1;
+        if (m_awk != 0) m_awk->inc_line_number ();
+
+        result = parse_line (line);
+        if (result != Awk::ok) return result;
+      } // while ((nl = text.find (begin, '\n')) != cmt_string::npos)
+    
+    if (begin < end)
+      {
+        text.substr (begin, end - begin, line);
+        if (m_awk != 0) m_awk->inc_line_number ();
+        
+        result = parse_line (line);
+      }
+    
+    /*
     for (pos = 0; pos < max_pos;)
       {
@@ -90 +122 @@
         if (result != Awk::ok) break;
       }
-
+    */
     return (result);
   }
@@ -232 +264 @@
   if (m_condition != ok) return (m_condition);
 
-  if (CmtSystem::testenv ("CMTTESTAWK"))
+  if (Cmt::get_debug () &&
+      CmtSystem::testenv ("CMTTESTAWK"))
     {
       Parser p (this, pattern, 0);
@@ -242 +275 @@
     {
       cmt_string line;
+      int nl;
+      int begin = 0;
+      int end = text.size ();
+      
+      while ((nl = text.find (begin, '\n')) != cmt_string::npos)
+        {
+          if (begin < nl && text[nl - 1] == '\r')
+            {
+              text.substr (begin, nl - 1 - begin, line);
+            }
+          else
+            {
+              text.substr (begin, nl - begin, line);
+            }
+          //      cerr << "|Awk::condition run> [" << line << "]" << endl;
+          begin = nl + 1;
+          m_line_number++;
+          
+          if (line != "")
+            {
+              if ((pattern == "") ||
+                  (line.find (pattern) != cmt_string::npos))
+                {
+                  filter (line);
+                  if (m_condition != ok) return (m_condition);
+                }
+            }
+        } // while ((nl = text.find (begin, '\n')) != cmt_string::npos)
+      
+      if (begin < end)
+        {
+          text.substr (begin, end - begin, line);
+          m_line_number++;
+          
+          if (line != "")
+            {
+              if ((pattern == "") ||
+                  (line.find (pattern) != cmt_string::npos))
+                {
+                  filter (line);
+                  if (m_condition != ok) return (m_condition);
+                }
+            }
+        }
+      /*
       int pos = 0;
       int max_pos;
@@ -315 +393 @@
             }
         }
+      */
     }