Mercurial > octave

changeset 21496:5d69326e8cc5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
textscan: Prefer std::string local variables to char arrays * textscan.cc (textscan::lookahead, textscan::scan_complex, textscan::skip_whitespace): Use std::string for local buffers rather than char arrays.
author Mike Miller <mtmiller@octave.org>
date Fri, 18 Mar 2016 22:37:52 -0700
parents 82089c8ed7fa
children 2d71bb0011a0
files libinterp/corefcn/textscan.cc
diffstat 1 files changed, 15 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/textscan.cc	Fri Mar 18 20:33:52 2016 -0700
+++ b/libinterp/corefcn/textscan.cc	Fri Mar 18 22:37:52 2016 -0700
@@ -1749,10 +1749,8 @@
               // treat_as_empty strings may be different sizes.
               // Read ahead longest, put it all back, then re-read the string
               // that matches.
-              char *look, look_buf [treat_as_empty_len + 1];
-              // prefill, in case EOF means part-filled.
-              memset (look_buf, '\0', treat_as_empty_len);
-              look = is.read (look_buf, treat_as_empty_len, pos);
+              std::string look_buf (treat_as_empty_len, '\0');
+              char *look = is.read (&look_buf[0], look_buf.size (), pos);
 
               is.clear (state);
               is.seekg (pos);        // reset to position before look-ahead
@@ -1765,7 +1763,7 @@
                     {
                       as_empty = true;
                                      // read just the right amount
-                      is.read (look_buf, s.size (), pos);
+                      is.read (&look_buf[0], s.size (), pos);
                       break;
                     }
                 }
@@ -2547,19 +2545,20 @@
           char *pos   = is.tellg ();
           std::ios::iostate state = is.rdstate ();
 
-          char *look, tmp [comment_len];
-          look = is.read (tmp, comment_len-1, pos);   // already read first char
+          std::string tmp (comment_len, '\0');
+          char *look = is.read (&tmp[0], comment_len-1, pos); // already read first char
           if (is && ! strncmp (comment_style(0).string_value ().substr (1)
                                .c_str (), look, comment_len-1))
             {
               found_comment = true;
 
               std::string dummy;
-              char eol [3] = {static_cast<char> (eol1),
-                              static_cast<char> (eol2),
-                              '\0'};
               if (comment_style.numel () == 1)  // skip to end of line
                 {
+                  std::string eol (3, '\0');
+                  eol[0] = eol1;
+                  eol[1] = eol2;
+
                   scan_caret (is, eol, dummy);
                   c1 = is.get_undelim ();
                   if (c1 == eol1 && eol1 != eol2 && is.peek_undelim () == eol2)
@@ -2569,16 +2568,15 @@
               else      // matching pair
                 {
                   std::string end_c = comment_style(1).string_value ();
-                        // last char of end-comment sequence
-                  char last[2] = {*(end_c.substr (end_c.length ()-1).c_str ()),
-                                  '\0'};
+                  // last char of end-comment sequence
+                  std::string last = end_c.substr (end_c.size () - 1);
                   std::string may_match ("");
                   do
                     {           // find sequence ending with last char
                       scan_caret (is, last, dummy);
                       is.get_undelim ();        // (read   last  itself)
 
-                      may_match = may_match + dummy + *last;
+                      may_match = may_match + dummy + last;
                       int start = may_match.length () - end_c.length ();
                       if (start < 0)
                         start = 0;
@@ -2615,10 +2613,8 @@
 
   char *pos = is.tellg ();
 
-  char *look, tmp [max_len + 1];
-
-  memset (tmp, '\0', max_len); // prefill, in case EOF means part-filled.
-  look = is.read (tmp, max_len, pos);
+  std::string tmp (max_len, '\0');
+  char *look = is.read (&tmp[0], tmp.size (), pos);
 
   is.clear ();
   is.seekg (pos);              // reset to position before look-ahead
@@ -2633,7 +2629,7 @@
       std::string s = targets (i).string_value ();
       if (! (*compare) (s.c_str (), look, s.size ()))
         {
-          is.read (tmp, s.size (), pos); // read just the right amount
+          is.read (&tmp[0], s.size (), pos); // read just the right amount
           break;
         }
     }