Mercurial > octave
diff liboctave/util/lo-regexp.cc @ 29654:d13d090cb03a stable
use std::size_t and std::ptrdiff_t in C++ code (bug #60471)
Files affected: make_int.cc, file-editor-tab.cc, octave-qscintilla.cc,
Cell.cc, Cell.h, call-stack.cc, call-stack.h, cellfun.cc, data.cc,
debug.cc, dlmread.cc, error.cc, event-queue.h, fcn-info.cc,
fcn-info.h, file-io.cc, ft-text-renderer.cc, gl2ps-print.cc,
graphics.cc, graphics.in.h, help.cc, hex2num.cc, input.cc,
latex-text-renderer.cc, load-path.cc, load-save.cc, load-save.h,
ls-hdf5.cc, ls-mat-ascii.cc, ls-mat5.cc, ls-oct-text.cc, mex.cc,
mexproto.h, mxarray.h, oct-map.cc, oct-stream.cc, oct-stream.h,
pager.cc, pager.h, pr-output.cc, regexp.cc, settings.h,
stack-frame.cc, stack-frame.h, strfns.cc, syminfo.cc, symrec.h,
symscope.cc, symscope.h, symtab.cc, sysdep.cc, toplev.cc, utils.cc,
utils.h, variables.cc, __fltk_uigetfile__.cc, __init_fltk__.cc,
audioread.cc, gzip.cc, cdef-class.cc, cdef-manager.cc, cdef-method.cc,
cdef-object.cc, cdef-object.h, ov-base-diag.cc, ov-base-diag.h,
ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base-scalar.h,
ov-base-sparse.h, ov-base.cc, ov-base.h, ov-cell.cc, ov-cell.h,
ov-ch-mat.cc, ov-class.cc, ov-class.h, ov-classdef.cc,
ov-fcn-handle.cc, ov-java.cc, ov-lazy-idx.h, ov-perm.cc, ov-perm.h,
ov-range.h, ov-str-mat.cc, ov-struct.cc, ov-struct.h, ov-usr-fcn.cc,
ov-usr-fcn.h, ov.cc, ov.h, ovl.cc, octave.cc, bp-table.cc, jit-ir.cc,
jit-ir.h, jit-typeinfo.cc, jit-typeinfo.h, jit-util.h, lex.h, lex.ll,
oct-lvalue.cc, oct-parse.yy, parse.h, profiler.h, pt-eval.cc,
pt-eval.h, pt-jit.cc, pt-jit.h, pt-pr-code.cc, pt-tm-const.cc,
pt-tm-const.h, Array.h, CMatrix.cc, DiagArray2.h, PermMatrix.h,
Sparse.h, dMatrix.cc, fCMatrix.cc, fMatrix.cc, bsxfun-defs.cc,
oct-fftw.cc, oct-fftw.h, randpoisson.cc, sparse-chol.cc,
mx-inlines.cc, file-ops.cc, lo-sysdep.cc, oct-env.cc, oct-time.cc,
action-container.cc, action-container.h, base-list.h, caseless-str.h,
cmd-edit.cc, cmd-hist.cc, data-conv.cc, data-conv.h, f77-fcn.h,
file-info.cc, file-info.h, kpse.cc, kpse.h, lo-cutils.h, lo-hash.h,
lo-regexp.cc, oct-base64.cc, oct-base64.h, oct-binmap.h, oct-glob.cc,
oct-shlib.cc, oct-shlib.h, oct-sort.cc, oct-sparse.h, oct-string.cc,
quit.cc, unwind-prot.h, url-transfer.cc, main.in.cc, mkoctfile.in.cc,
and shared-fcns.h.
(grafted from aef11bb4e6d1f303ad9de5688fcb7244ef48867e)
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 28 Apr 2021 22:57:42 -0400 |
| parents | 0a5b15007766 |
| children | 32f4357ac8d9 |
line wrap: on
line diff
--- a/liboctave/util/lo-regexp.cc Wed Apr 28 22:23:39 2021 -0400 +++ b/liboctave/util/lo-regexp.cc Wed Apr 28 22:57:42 2021 -0400 @@ -74,10 +74,10 @@ // If we had a previously compiled pattern, release it. free (); - size_t max_length = MAXLOOKBEHIND; + std::size_t max_length = MAXLOOKBEHIND; - size_t pos = 0; - size_t new_pos; + std::size_t pos = 0; + std::size_t new_pos; int inames = 0; std::ostringstream buf; @@ -96,7 +96,7 @@ // that here by replacing name tokens by dummy names, and dealing // with the dummy names later. - size_t tmp_pos = m_pattern.find_first_of ('>', new_pos); + std::size_t tmp_pos = m_pattern.find_first_of ('>', new_pos); if (tmp_pos == std::string::npos) (*current_liboctave_error_handler) @@ -146,8 +146,8 @@ // avoid issues. int brackets = 1; - size_t tmp_pos1 = new_pos + 2; - size_t tmp_pos2 = tmp_pos1; + std::size_t tmp_pos1 = new_pos + 2; + std::size_t tmp_pos2 = tmp_pos1; while (tmp_pos1 < m_pattern.length () && brackets > 0) { @@ -173,7 +173,7 @@ } else { - size_t tmp_pos3 = m_pattern.find_first_of ("*+", tmp_pos2); + std::size_t tmp_pos3 = m_pattern.find_first_of ("*+", tmp_pos2); if (tmp_pos3 != std::string::npos && tmp_pos3 < tmp_pos1) { @@ -188,7 +188,7 @@ buf << m_pattern.substr (pos, new_pos - pos) << '('; - size_t i; + std::size_t i; if (m_pattern.at (tmp_pos3) == '*') i = 0; @@ -263,7 +263,7 @@ int namecount; int nameentrysize; char *nametable; - size_t idx = 0; + std::size_t idx = 0; pcre *re = static_cast<pcre *> (m_data); @@ -393,7 +393,7 @@ { if (nidx[j] == i) { - size_t len = ovector[2*i+1] - ovector[2*i]; + std::size_t len = ovector[2*i+1] - ovector[2*i]; named_tokens(m_named_idx(j)) = std::string (*(listptr+i-pos_offset), len); @@ -402,7 +402,7 @@ } } - size_t len = ovector[2*i+1] - ovector[2*i]; + std::size_t len = ovector[2*i+1] - ovector[2*i]; tokens(pos_match++) = std::string (*(listptr+i), len); } else @@ -460,7 +460,7 @@ // Declare rep_token_t used in processing replacement string typedef struct { - size_t pos; + std::size_t pos; int num; } rep_token_t; @@ -471,7 +471,7 @@ const regexp::match_data rx_lst = match (buffer); - size_t num_matches = rx_lst.size (); + std::size_t num_matches = rx_lst.size (); if (num_matches == 0) { @@ -491,7 +491,7 @@ std::vector<rep_token_t> tokens; tokens.reserve (5); // Reserve memory for 5 pattern replacements - for (size_t i=0; i < repstr.size (); i++) + for (std::size_t i=0; i < repstr.size (); i++) { if (repstr[i] == '\\') { @@ -526,10 +526,10 @@ if (num_tokens > 0) { // Determine replacement length - const size_t replen = repstr.size () - 2*num_tokens; + const std::size_t replen = repstr.size () - 2*num_tokens; int delta = 0; auto p = rx_lst.begin (); - for (size_t i = 0; i < num_matches; i++) + for (std::size_t i = 0; i < num_matches; i++) { octave_quit (); @@ -537,13 +537,13 @@ double end = p->end (); const Matrix pairs (p->token_extents ()); - size_t pairlen = 0; + std::size_t pairlen = 0; for (int j = 0; j < num_tokens; j++) { if (tokens[j].num == 0) - pairlen += static_cast<size_t> (end - start + 1); + pairlen += static_cast<std::size_t> (end - start + 1); else if (tokens[j].num <= pairs.rows ()) - pairlen += static_cast<size_t> (pairs(tokens[j].num-1,1) + pairlen += static_cast<std::size_t> (pairs(tokens[j].num-1,1) - pairs(tokens[j].num-1,0) + 1); } @@ -554,9 +554,9 @@ // Build replacement string rep.reserve (buffer.size () + delta); - size_t from = 0; + std::size_t from = 0; p = rx_lst.begin (); - for (size_t i = 0; i < num_matches; i++) + for (std::size_t i = 0; i < num_matches; i++) { octave_quit (); @@ -564,10 +564,10 @@ double end = p->end (); const Matrix pairs (p->token_extents ()); - rep.append (&buffer[from], static_cast<size_t> (start - 1 - from)); - from = static_cast<size_t> (end); + rep.append (&buffer[from], static_cast<std::size_t> (start - 1 - from)); + from = static_cast<std::size_t> (end); - size_t cur_pos = 0; + std::size_t cur_pos = 0; for (int j = 0; j < num_tokens; j++) { @@ -578,14 +578,14 @@ if (k == 0) { // replace with entire match - rep.append (&buffer[static_cast<size_t> (end - 1)], - static_cast<size_t> (end - start + 1)); + rep.append (&buffer[static_cast<std::size_t> (end - 1)], + static_cast<std::size_t> (end - start + 1)); } else if (k <= pairs.rows ()) { // replace with group capture - rep.append (&buffer[static_cast<size_t> (pairs(k-1,0)-1)], - static_cast<size_t> (pairs(k-1,1) + rep.append (&buffer[static_cast<std::size_t> (pairs(k-1,0)-1)], + static_cast<std::size_t> (pairs(k-1,1) - pairs(k-1,0) + 1)); } else @@ -603,10 +603,10 @@ else { // Determine repstr length - const size_t replen = repstr.size (); + const std::size_t replen = repstr.size (); int delta = 0; auto p = rx_lst.begin (); - for (size_t i = 0; i < num_matches; i++) + for (std::size_t i = 0; i < num_matches; i++) { octave_quit (); @@ -617,15 +617,15 @@ // Build replacement string rep.reserve (buffer.size () + delta); - size_t from = 0; + std::size_t from = 0; p = rx_lst.begin (); - for (size_t i = 0; i < num_matches; i++) + for (std::size_t i = 0; i < num_matches; i++) { octave_quit (); rep.append (&buffer[from], - static_cast<size_t> (p->start () - 1 - from)); - from = static_cast<size_t> (p->end ()); + static_cast<std::size_t> (p->start () - 1 - from)); + from = static_cast<std::size_t> (p->end ()); rep.append (repstr); p++; }